From fc9378952bf4d5ecb7adc55c36083763761b0fb9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 28 May 2018 12:59:29 +0200 Subject: nuke {tests,examples}_need_tools flags making the dependencies on tools/ optional was meant to maximize build parallelization, but it's just too fragile, as nobody ever remembers (or even knows) about having to add the flags when necessary. Task-number: QTBUG-68478 Change-Id: I85c0b65d5a63109aedc24bc17eaaaf46b777b634 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_parts.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index 3d5eb96742..4598031769 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -39,7 +39,7 @@ exists($$_PRO_FILE_PWD_/examples/examples.pro) { sub_examples.subdir = examples sub_examples.target = sub-examples contains(SUBDIRS, sub_src): sub_examples.depends = sub_src - examples_need_tools: sub_examples.depends += sub_tools + contains(SUBDIRS, sub_tools): sub_examples.depends += sub_tools !contains(QT_BUILD_PARTS, examples): sub_examples.CONFIG = no_default_target no_default_install SUBDIRS += sub_examples } @@ -48,7 +48,7 @@ exists($$_PRO_FILE_PWD_/tests/tests.pro) { sub_tests.subdir = tests sub_tests.target = sub-tests contains(SUBDIRS, sub_src): 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 + contains(SUBDIRS, sub_tools): sub_tests.depends += sub_tools sub_tests.CONFIG = no_default_install !contains(QT_BUILD_PARTS, tests) { sub_tests.CONFIG += no_default_target -- cgit v1.2.3