Re #6630. qcollectiongenerator is now required by cmake.
Re #6630. Beefed up location of qt assistant.