From 55c14e35f10d5a293ae6535a1ee31963b80109a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 4 Nov 2013 12:08:43 +0100 Subject: Resolve Qt module deps before determining if QML import scanner is needed The qtAddModules functions resolves deps internally, but doesn't affect the original QT and QT_PRIVATE variables. We need to pick up situations such as the user adding QT += quick, which implies QT += qml through the QtQuick module's dependecies. Change-Id: I14411dbea3e4f7402be404073a3fe8f18dbb165f Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt.prf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 31d8b0e3ec..71b99825ec 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -74,7 +74,10 @@ wince*:static:gui { } # static builds: link qml import plugins into the app. -if(contains(QT, qml)|contains(QT_PRIVATE, qml)): \ +qt_module_deps = $$QT $$QT_PRIVATE +qt_module_deps = $$replace(qt_module_deps, -private$, _private) +qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") +contains(qt_module_deps, qml): \ contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan { # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner) -- cgit v1.2.3