From fecefdd36978cf2562f0f16f5f79debff7d07f79 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Jul 2019 16:10:31 +0200 Subject: 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 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 330c5347c5..cec2bfa183 100644 --- a/configure.cmake +++ b/configure.cmake @@ -243,7 +243,7 @@ qt_feature("developer_build" ) qt_feature("private_tests" PRIVATE LABEL "Developer build: private_tests" - AUTODETECT OFF + CONDITION QT_FEATURE_developer_build ) qt_feature_definition("developer_build" "QT_BUILD_INTERNAL") qt_feature("appstore_compliant" PUBLIC -- cgit v1.2.3