summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-06-16 08:44:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-16 15:03:21 +0000
commit83b90ef261de41f826a0225186d69199aa77f5ba (patch)
tree64c207d21c4eab6dbeba7798b4fc717e7b733587
parentd8424686851ed843e2a799091895aa8d3a0e7645 (diff)
Expose the "debug" build feature privately
Consumers can now check the "debug" feature to determine whether Qt was built in the "Debug" configuration. Change-Id: I225125d38ded508e9792a730ce421b33bceacddf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3ca5b46e5da04672ed0eaeaa6a5b30673705e4c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--.prev_configure.cmake2
-rw-r--r--configure.cmake2
-rw-r--r--configure.json3
3 files changed, 4 insertions, 3 deletions
diff --git a/.prev_configure.cmake b/.prev_configure.cmake
index 8b5b3333c6..8f9be0d963 100644
--- a/.prev_configure.cmake
+++ b/.prev_configure.cmake
@@ -450,7 +450,7 @@ qt_feature_definition("developer-build" "QT_BUILD_INTERNAL")
qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
NAME "private_tests"
)
-qt_feature("debug"
+qt_feature("debug" PRIVATE
LABEL "Build for debugging"
AUTODETECT ON
CONDITION CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
diff --git a/configure.cmake b/configure.cmake
index 54707fd4c1..b252972077 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -473,7 +473,7 @@ qt_feature_definition("developer-build" "QT_BUILD_INTERNAL")
qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
NAME "private_tests"
)
-qt_feature("debug"
+qt_feature("debug" PRIVATE
LABEL "Build for debugging"
AUTODETECT ON
CONDITION CMAKE_BUILD_TYPE STREQUAL Debug OR Debug IN_LIST CMAKE_CONFIGURATION_TYPES
diff --git a/configure.json b/configure.json
index 1cb2107756..45f2b1e7f0 100644
--- a/configure.json
+++ b/configure.json
@@ -783,7 +783,8 @@
},
"debug": {
"label": "Build for debugging",
- "autoDetect": "features.developer-build || (config.win32 && !config.gcc) || config.darwin"
+ "autoDetect": "features.developer-build || (config.win32 && !config.gcc) || config.darwin",
+ "output": [ "privateFeature" ]
},
"debug_and_release": {
"label": "Compile libs in debug and release mode",