aboutsummaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-10-17 15:51:26 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-17 15:52:34 +0200
commit2ec14c7b781872859bbc36ac8b2a4ebc2d456859 (patch)
tree476d17e15a403ec4834684eb8af133b5cd50c860 /tools/tools.pro
parent83c466dd8c62ebfb80c753c458683ee24aeff907 (diff)
Fix iOS builds
Other tools in tools could theoretically be using QML modules, so qt.prf tries to use the qmlimportscanner on them. That means we have to build it before all the other tools. Change-Id: I5ee49d0f3f4f3bf73183a6be9414c8d0e926bdf1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 2dab801be7..994a8c7114 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -9,7 +9,6 @@ SUBDIRS += \
qmlbundle \
v4
qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing
-qtHaveModule(quick): SUBDIRS += qmlimportscanner
# qmlmin & qmlbundle are build tools.
# qmlscene is needed by the autotests.
@@ -21,3 +20,8 @@ qtNomakeTools( \
qmlplugindump \
qmleasing \
)
+
+qtHaveModule(quick) {
+ for(subdir, SUBDIRS): $${subdir}.depends += qmlimportscanner
+ SUBDIRS += qmlimportscanner
+}