AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose the "debug" build feature privately

Browse Source 
Consumers can now check the "debug" feature to determine whether Qt was
built in the "Debug" configuration.

Pick-to: 6.2 6.1
Change-Id: I225125d38ded508e9792a730ce421b33bceacddf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Joerg Bornemann 2021-06-16 08:44:36 +02:00
parent 9648ffff7e
commit 3ca5b46e5d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.prev_configure.cmake
View File

@ -420,7 +420,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

3
configure.cmake
View File

@ -446,7 +446,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
@ -1161,4 +1161,3 @@ qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)
qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)
qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)

3
configure.json
View File

@ -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",