Added custom flags for enabling dependencies of other parts to tools
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Fri, 30 Nov 2012 13:42:52 +0000 (15:42 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 30 Nov 2012 20:57:49 +0000 (21:57 +0100)
Introduced CONFIG flags examples_need_tools and tests_need_tools.

Change-Id: I4789d05f6bc0a63c75340c3b3e2aecde18c42c20
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
mkspecs/features/qt_parts.prf

index ebbe789..75fa296 100644 (file)
@@ -21,6 +21,7 @@ exists($$_PRO_FILE_PWD_/examples/examples.pro) {
     sub_examples.subdir = examples
     sub_examples.target = sub-examples
     sub_examples.depends = sub_src
+    examples_need_tools: sub_examples.depends += sub_tools
     !contains(QT_BUILD_PARTS, examples): sub_examples.CONFIG = no_default_target no_default_install
     SUBDIRS += sub_examples
 }
@@ -30,6 +31,7 @@ exists($$_PRO_FILE_PWD_/demos/demos.pro) {
     sub_demos.subdir = demos
     sub_demos.target = sub-demos
     sub_demos.depends = sub_src
+    examples_need_tools: sub_demos.depends += sub_tools
     !contains(QT_BUILD_PARTS, examples): sub_demos.CONFIG = no_default_target no_default_install
     SUBDIRS += sub_demos
 }
@@ -38,6 +40,7 @@ exists($$_PRO_FILE_PWD_/tests/tests.pro) {
     sub_tests.subdir = tests
     sub_tests.target = sub-tests
     sub_tests.depends = sub_src   # The tests may have a run-time only dependency on other parts
+    tests_need_tools: sub_tests.depends += sub_tools
     sub_tests.CONFIG = no_default_install
     !contains(QT_BUILD_PARTS, tests) {
         sub_tests.CONFIG += no_default_target