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>

diff --git a/tools/tools.pro b/tools/tools.pro
index 2dab801..994a8c7 100644 (file)
--- 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
+}