From 40620e927da43d83ff7bb9f90a9b31ef7e91fe05 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 22 Oct 2013 12:03:53 +0200
Subject: untangle SUBDIRS

this also excludes qmlprofiler on android, as it is not a host tool.

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

(limited to 'tools')

diff --git a/tools/tools.pro b/tools/tools.pro
index 217748915b..b7b8abaac9 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,13 +1,18 @@
 TEMPLATE = subdirs
-qtHaveModule(quick): !android|android_app: SUBDIRS += qmlscene qmlplugindump
-qtHaveModule(qmltest): !android|android_app: SUBDIRS += qmltestrunner
 SUBDIRS += \
-    qmlmin \
-    qmlprofiler
-!android|android_app: SUBDIRS += \
-                          qml \
-                          qmlbundle
-qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing
+    qmlmin
+!android|android_app {
+    SUBDIRS += \
+        qml \
+        qmlprofiler \
+        qmlbundle
+    qtHaveModule(quick) {
+        SUBDIRS += qmlscene qmlplugindump
+        qtHaveModule(widgets): SUBDIRS += qmleasing
+    }
+    qtHaveModule(qmltest): SUBDIRS += qmltestrunner
+    contains(QT_CONFIG, private_tests): SUBDIRS += qmljs
+}
 
 # qmlmin & qmlbundle are build tools.
 # qmlscene is needed by the autotests.
@@ -20,8 +25,6 @@ qtNomakeTools( \
     qmleasing \
 )
 
-contains(QT_CONFIG, private_tests): SUBDIRS += qmljs
-
 qtHaveModule(quick) {
     for(subdir, SUBDIRS): $${subdir}.depends += qmlimportscanner
     SUBDIRS += qmlimportscanner
-- 
cgit v1.2.3