adjust to new "configure -nomake tools" semantics

Change-Id: I34ea6a8ea5f6f2641bf5deaf2a7136e5ed51a8ba
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 58c33f2..8bc15a5 100644 (file)
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1 +1,2 @@
+CONFIG += tests_need_tools
 load(qt_parts)

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index b973d44..ed828df 100644 (file)
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -69,3 +69,7 @@ SUBDIRS += debugger
 contains(QT_CONFIG, private_tests) {
     SUBDIRS += $$PRIVATETESTS
 }
+
+qtNomakeTools( \
+    qmlplugindump \
+)

diff --git a/tools/tools.pro b/tools/tools.pro
index 86e2f38..eda9e85 100644 (file)
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,3 +6,14 @@ SUBDIRS += \
     qmlprofiler \
     qmlbundle
 qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing
+
+# qmlmin & 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.
+# The other apps are mostly "desktop" tools and are thus excluded.
+qtNomakeTools( \
+    qmlprofiler \
+    qmlplugindump \
+    qmleasing \
+)