From 94a704bb87e14cfc6b49bded7d22128c75aba6ba Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Fri, 2 Jun 2023 09:38:40 +0200
Subject: 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 <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit ff2a14917f48606af2e153bdfd7e06fe46d8a31b)
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qmldesigner/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/plugins/qmldesigner/CMakeLists.txt')

diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 08bde98bef..600f28814f 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> 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 ($<CONFIG:Debug> OR WITH_TESTS)
     PROPERTIES COMPILE_WARNING_AS_ERROR ON
 )
 
-- 
cgit v1.2.3


From d1649b060ba06cdfb313220d4ac8ec3181020051 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 27 Jun 2023 11:43:07 +0200
Subject: QmlDesigner: Disable warnings-as-errors by default

for everyone that doesn't explicitly set the BUILD_DESIGNSTUDIO CMake
variable or the corresponding environment variable or CMake option.

Fixes: QTCREATORBUG-29238
Change-Id: Ie1959a468fc7bee0fed790b025ecdb3f49ab8f08
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/qmldesigner/CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/plugins/qmldesigner/CMakeLists.txt')

diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 600f28814f..072e802d36 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) AND ($<CONFIG:Debug> OR WITH_TESTS)
+    CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
     PROPERTIES COMPILE_WARNING_AS_ERROR ON
 )
 
@@ -84,7 +84,7 @@ endif()
 
 
 extend_qtc_library(QmlDesignerCore
-    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
 )
 
@@ -481,7 +481,7 @@ add_qtc_plugin(QmlDesigner
 )
 
 extend_qtc_plugin(QmlDesigner
-    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
 )
 
@@ -1089,7 +1089,7 @@ add_qtc_plugin(assetexporterplugin
 )
 
 extend_qtc_plugin(assetexporterplugin
-    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
 )
 
@@ -1122,7 +1122,7 @@ add_qtc_plugin(componentsplugin
 )
 
 extend_qtc_plugin(componentsplugin
-    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
 )
 
@@ -1142,7 +1142,7 @@ add_qtc_plugin(qmlpreviewplugin
 )
 
 extend_qtc_plugin(qmlpreviewplugin
-    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
 )
 
@@ -1164,7 +1164,7 @@ add_qtc_plugin(qtquickplugin
 )
 
 extend_qtc_plugin(qtquickplugin
-    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
 )
 
-- 
cgit v1.2.3