diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-05-11 16:29:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-05-19 11:57:26 +0000 |
| commit | 906ed263d2b7174a9ce60add6c25f28cf2a6b5c3 (patch) | |
| tree | f9eb25bb6287d912056107cfff3d48b62bb4665d /mkspecs | |
| parent | d37458c5fb753861e9479278675162941e701a63 (diff) | |
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
Change-Id: I53748fc03354ffdf015f85c93efc6e86c446adb8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 99817446843bfb06799d74b9db171dbd3de7d24b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_parts.prf | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index 4598031769..579ade09c8 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 } |