1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure: Do not automatically enable compilation of examples for tests

Browse Source 
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 <edward.welbourne@qt.io>
This commit is contained in:
Kai Koehne 2020-05-11 16:29:31 +02:00
parent b2c991bfea
commit 9981744684
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkspecs/features/qt_parts.prf
View File

@ -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
}