From 99817446843bfb06799d74b9db171dbd3de7d24b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 11 May 2020 16:29:31 +0200 Subject: [PATCH] Configure: Do not automatically enable compilation of examples for tests If user's specified to build without examples we shouldn't silently overwrite this. This might mean that some tests will fail to run then, though. Fixes: QTBUG-84087 Pick-to: 5.15 Change-Id: I53748fc03354ffdf015f85c93efc6e86c446adb8 Reviewed-by: Edward Welbourne --- mkspecs/features/qt_parts.prf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index 4598031769b..579ade09c8f 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -50,14 +50,7 @@ exists($$_PRO_FILE_PWD_/tests/tests.pro) { contains(SUBDIRS, sub_src): sub_tests.depends = sub_src # The tests may have a run-time only dependency on other parts 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 - } else: !uikit { - # 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 - } + !contains(QT_BUILD_PARTS, tests): sub_tests.CONFIG += no_default_target SUBDIRS += sub_tests }