From 113f4bc2799285f2565b69a2886dba12b2550798 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 22 Oct 2013 12:06:56 +0200
Subject: sanitize dependencies surrounding qmlimportscanner

the tool's subdir must come before its dependants, otherwise qmake -r is
broken (ok, that's mostly academical nowadays).
also remove the unnecessary dependencies.

Change-Id: Idf785522d466d4abb5f864ef4b66784024322339
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 tools/tools.pro | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/tools.pro b/tools/tools.pro
index b7b8abaac9..c3b1ad94ec 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    qmlmin
+    qmlmin \
+    qmlimportscanner
 !android|android_app {
     SUBDIRS += \
         qml \
@@ -14,7 +15,10 @@ SUBDIRS += \
     contains(QT_CONFIG, private_tests): SUBDIRS += qmljs
 }
 
-# qmlmin & qmlbundle are build tools.
+qml.depends = qmlimportscanner
+qmleasing.depends = qmlimportscanner
+
+# qmlmin, qmlimportscanner & qmlbundle are build tools.
 # qmlscene is needed by the autotests.
 # qmltestrunner may be useful for manual testing.
 # qmlplugindump cannot be a build tool, because it loads target plugins.
@@ -24,8 +28,3 @@ qtNomakeTools( \
     qmlplugindump \
     qmleasing \
 )
-
-qtHaveModule(quick) {
-    for(subdir, SUBDIRS): $${subdir}.depends += qmlimportscanner
-    SUBDIRS += qmlimportscanner
-}
-- 
cgit v1.2.3