From 94a704bb87e14cfc6b49bded7d22128c75aba6ba Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Fri, 2 Jun 2023 09:38:40 +0200 Subject: [PATCH] QmlDesigner: Only enable error on warnings as you compile with tests or in debug There is no advantage for an enduser to get errors on warnings because he cannot do much about it. It is still nudging the developers to fix the warnings. Task-number: QTCREATORBUG-29238 Change-Id: If9f73f2766d686b119cd264ee7b3c3c9afa2c70d Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen (cherry picked from commit ff2a14917f48606af2e153bdfd7e06fe46d8a31b) Reviewed-by: hjk --- src/plugins/qmldesigner/CMakeLists.txt | 14 +++++++------- src/plugins/qmldesignerbase/CMakeLists.txt | 2 +- src/plugins/qmlprojectmanager/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 08bde98beff..600f28814f5 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -31,7 +31,7 @@ add_qtc_library(QmlDesignerUtils STATIC ) extend_qtc_library(QmlDesignerUtils - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -84,7 +84,7 @@ endif() extend_qtc_library(QmlDesignerCore - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -481,7 +481,7 @@ add_qtc_plugin(QmlDesigner ) extend_qtc_plugin(QmlDesigner - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -1089,7 +1089,7 @@ add_qtc_plugin(assetexporterplugin ) extend_qtc_plugin(assetexporterplugin - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -1122,7 +1122,7 @@ add_qtc_plugin(componentsplugin ) extend_qtc_plugin(componentsplugin - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -1142,7 +1142,7 @@ add_qtc_plugin(qmlpreviewplugin ) extend_qtc_plugin(qmlpreviewplugin - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) @@ -1164,7 +1164,7 @@ add_qtc_plugin(qtquickplugin ) extend_qtc_plugin(qtquickplugin - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) diff --git a/src/plugins/qmldesignerbase/CMakeLists.txt b/src/plugins/qmldesignerbase/CMakeLists.txt index 628403874c0..f798542dbd8 100644 --- a/src/plugins/qmldesignerbase/CMakeLists.txt +++ b/src/plugins/qmldesignerbase/CMakeLists.txt @@ -12,7 +12,7 @@ add_qtc_plugin(QmlDesignerBase ) extend_qtc_plugin(QmlDesignerBase - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON ) diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt index ad71e3fbffb..df2357e106d 100644 --- a/src/plugins/qmlprojectmanager/CMakeLists.txt +++ b/src/plugins/qmlprojectmanager/CMakeLists.txt @@ -25,7 +25,7 @@ add_qtc_plugin(QmlProjectManager ) extend_qtc_plugin(QmlProjectManager - CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR + CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($ OR WITH_TESTS) PROPERTIES COMPILE_WARNING_AS_ERROR ON )