From 9d1f44b9ce61ae42eccf92d24d5eda437ecad05e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Jul 2012 08:59:40 +0200 Subject: [PATCH] make sure that building tests implies building other parts some tests have runtime deps on the other parts Change-Id: Ieb2925e762e94b3c0b16884be0f59e10ce8e4878 Reviewed-by: Rohan McGovern Reviewed-by: Friedemann Kleint --- mkspecs/features/qt_parts.prf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index df932dd7b3..94f58ffdcc 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -34,9 +34,16 @@ exists($$_PRO_FILE_PWD_/demos/demos.pro) { 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 tools + sub_tests.depends = sub_src # The tests may have a run-time only dependency on other parts sub_tests.CONFIG = no_default_install - !contains(QT_BUILD_PARTS, tests): sub_tests.CONFIG += no_default_target + !contains(QT_BUILD_PARTS, tests) { + sub_tests.CONFIG += no_default_target + } else { + # Make sure these are there in case we need them + sub_tools.CONFIG -= no_default_target + sub_examples.CONFIG -= no_default_target + sub_demos.CONFIG -= no_default_target + } SUBDIRS += sub_tests }