|author||Simon Hausmann <firstname.lastname@example.org>||2019-07-17 16:10:31 +0200|
|committer||Alexandru Croitor <email@example.com>||2019-07-22 08:29:33 +0000|
Fix mapping of features to private features
When a feature generates a private feature, we should not just repeat the condition but also make it depend on the original feature. In qmake features had different outputs, while we have a 1:1 mapping. For example the developer_build feature had "private_tests" as an output feature. There's no condition attached to the feature and auto-detect is off, so we'd generate qt_feature("developer_build" AUTODETECT OFF) qt_feature("private_tests" AUTODETECT OFF) and that's wrong, because when the user enables the visible feature (developer_build) we want it to propagate to the private_tests feature. Change-Id: Id8408864802fa1e1ed9e67a5f47d1d2fde38d321 Reviewed-by: Leander Beernaert <firstname.lastname@example.org> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <email@example.com>
Diffstat (limited to 'configure.cmake')
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake
index 330c5347c5..cec2bfa183 100644
@@ -243,7 +243,7 @@ qt_feature("developer_build"
LABEL "Developer build: private_tests"
- AUTODETECT OFF
+ CONDITION QT_FEATURE_developer_build