Fix more regressions due to new Qt modules approach.
Fix more regressions due to new Qt modules approach.

Change-Id: I7e3ebad2730f08371a4036439fcc3b3c3d82be5c
Reviewed-by: Joerg Bornemann <47777b9406dbddd02a3fdca8341789a013805a11@digia.com>

gatzka/qt-labs-qbs,gatzka/qt-labs-qbs,gatzka/qt-labs-qbs,qt-labs/qbs,Distrotech/qbs,villytiger/qbs,Distrotech/qbs,qt-labs/qbs,qtproject/qt-labs-qbs,gatzka/qt-labs-qbs,qt-labs/qbs,Distrotech/qbs,villytiger/qbs,Distrotech/qbs,villytiger/qbs,gatzka/qt-labs-qbs,gatzka/qt-labs-qbs,villytiger/qbs,Distrotech/qbs,villytiger/qbs,qt-labs/qbs,Distrotech/qbs,qtproject/qt-labs-qbs,gatzka/qt-labs-qbs,qt-labs/qbs,villytiger/qbs,qtproject/qt-labs-qbs,qtproject/qt-labs-qbs,qtproject/qt-labs-qbs,Distrotech/qbs,qtproject/qt-labs-qbs,qtproject/qt-labs-qbs,qt-labs/qbs,qt-labs/qbs