diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-07-04 17:31:14 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-07-04 16:22:32 +0000 |
| commit | 48230d63b8a669f982ed02399d7f665b07fe768d (patch) | |
| tree | 72764cd2a246129c4178710fec955f6a5e19cd2a /src/plugins/qmldesignerbase | |
| parent | c572855b95069a5a11184dd1ce862ba8499c5be2 (diff) | |
| parent | 1487f1a0c00a1310bdd49f7a744f431a429e4657 (diff) | |
Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts:
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmldesignerbase/CMakeLists.txt
src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
Diffstat (limited to 'src/plugins/qmldesignerbase')
| -rw-r--r-- | src/plugins/qmldesignerbase/CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/qmldesignerbase/CMakeLists.txt b/src/plugins/qmldesignerbase/CMakeLists.txt index f798542dbd8..a191b6d43ca 100644 --- a/src/plugins/qmldesignerbase/CMakeLists.txt +++ b/src/plugins/qmldesignerbase/CMakeLists.txt @@ -1,6 +1,12 @@ -env_with_default("QDS_DISABLE_COMPILE_WARNING_AS_ERROR" ENV_QDS_DISABLE_COMPILE_WARNING_AS_ERROR OFF) -option(DISABLE_COMPILE_WARNING_AS_ERROR "Dont treat warnings as errors" ${ENV_QDS_DISABLE_COMPILE_WARNING_AS_ERROR}) -add_feature_info("Treat warnings as errors" ${DISABLE_COMPILE_WARNING_AS_ERROR} "") +if(BUILD_DESIGNSTUDIO AND ($<CONFIG:Debug> OR WITH_TESTS)) + set(ENABLE_COMPILE_WARNING_AS_ERROR_DEFAULT ON) +else() + set(ENABLE_COMPILE_WARNING_AS_ERROR_DEFAULT OFF) +endif() +env_with_default("QDS_ENABLE_COMPILE_WARNING_AS_ERROR" ENV_ENABLE_COMPILE_WARNING_AS_ERROR + ${ENABLE_COMPILE_WARNING_AS_ERROR_DEFAULT}) +option(ENABLE_COMPILE_WARNING_AS_ERROR "Treat warnings as errors in QmlDesigner" ${ENV_ENABLE_COMPILE_WARNING_AS_ERROR}) +add_feature_info("Treat warnings as errors in QmlDesigner" ${ENABLE_COMPILE_WARNING_AS_ERROR} "") add_qtc_plugin(QmlDesignerBase CONDITION TARGET Qt::QuickWidgets @@ -12,7 +18,7 @@ add_qtc_plugin(QmlDesignerBase ) extend_qtc_plugin(QmlDesignerBase - CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($<CONFIG:Debug> OR WITH_TESTS) + CONDITION ENABLE_COMPILE_WARNING_AS_ERROR PROPERTIES COMPILE_WARNING_AS_ERROR ON ) |