From d14c38e8736adc182ebac0a5448684aff90cacb0 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Mon, 17 Apr 2023 14:46:03 +0200
Subject: [PATCH] QmlDeesigner: Add feature to disable error on warnings

Change-Id: Idc0cbf2c6fd4069d84fe18de190d91ed94610a8a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qmldesigner/CMakeLists.txt       | 36 +++++++++++++++++++-
 src/plugins/qmldesignerbase/CMakeLists.txt   | 10 +++++-
 src/plugins/qmlprojectmanager/CMakeLists.txt |  6 +++-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 9280965ce0d..ed558082e1e 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -25,7 +25,6 @@ option(USE_PROJECTSTORAGE "Use ProjectStorage" ${ENV_QDS_USE_PROJECTSTORAGE})
 add_feature_info("ProjectStorage" ${USE_PROJECTSTORAGE} "")
 
 add_qtc_library(QmlDesignerUtils STATIC
-  PROPERTIES COMPILE_WARNING_AS_ERROR ON
   DEPENDS
     Qt::Gui Utils Qt::QmlPrivate
   DEFINES QMLDESIGNERUTILS_LIBRARY
@@ -44,6 +43,11 @@ add_qtc_library(QmlDesignerUtils STATIC
     qmldesignerutils_global.h
 )
 
+extend_qtc_library(QmlDesignerUtils
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 add_qtc_library(QmlDesignerCore STATIC
   EXCLUDE_FROM_INSTALL
   DEPENDS
@@ -79,6 +83,11 @@ add_qtc_library(QmlDesignerCore STATIC
     rewritertransaction.h
 )
 
+extend_qtc_library(QmlDesignerCore
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 extend_qtc_library(QmlDesignerCore
   CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0
 
@@ -484,6 +493,11 @@ extend_qtc_plugin(QmlDesigner
     QMLDESIGNER_PLUGIN_PATH "${QmlDesignerPluginInstallPrefix}"
 )
 
+extend_qtc_plugin(QmlDesigner
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 function(get_and_add_as_subdirectory name repository git_tag build_dir source_dir source_subdir)
     # make the configuration in the build dir
     file(MAKE_DIRECTORY ${build_dir}/${name})
@@ -553,6 +567,11 @@ add_qtc_plugin(assetexporterplugin
   PLUGIN_PATH ${QmlDesignerPluginInstallPrefix}
 )
 
+extend_qtc_plugin(assetexporterplugin
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 add_qtc_plugin(componentsplugin
   PLUGIN_CLASS ComponentsPlugin
   CONDITION TARGET QmlDesigner
@@ -569,6 +588,11 @@ add_qtc_plugin(componentsplugin
   PLUGIN_PATH ${QmlDesignerPluginInstallPrefix}
 )
 
+extend_qtc_plugin(componentsplugin
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 add_qtc_plugin(qmlpreviewplugin
   PLUGIN_CLASS QmlPreviewWidgetPlugin
   CONDITION TARGET QmlDesigner
@@ -580,6 +604,11 @@ add_qtc_plugin(qmlpreviewplugin
   PLUGIN_PATH ${QmlDesignerPluginInstallPrefix}
 )
 
+extend_qtc_plugin(qmlpreviewplugin
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 add_qtc_plugin(qtquickplugin
   PLUGIN_CLASS QtQuickPlugin
   CONDITION TARGET QmlDesigner
@@ -591,6 +620,11 @@ add_qtc_plugin(qtquickplugin
   PLUGIN_PATH ${QmlDesignerPluginInstallPrefix}
 )
 
+extend_qtc_plugin(qtquickplugin
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 add_subdirectory(studioplugin)
 
 extend_qtc_plugin(QmlDesigner
diff --git a/src/plugins/qmldesignerbase/CMakeLists.txt b/src/plugins/qmldesignerbase/CMakeLists.txt
index 314940988f5..f02c4861067 100644
--- a/src/plugins/qmldesignerbase/CMakeLists.txt
+++ b/src/plugins/qmldesignerbase/CMakeLists.txt
@@ -1,5 +1,8 @@
+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} "")
+
 add_qtc_plugin(QmlDesignerBase
-  PROPERTIES COMPILE_WARNING_AS_ERROR ON
   CONDITION TARGET Qt::QuickWidgets
   DEPENDS Qt::Core Qt::QuickWidgets
   PLUGIN_DEPENDS Core ProjectExplorer QtSupport
@@ -8,6 +11,11 @@ add_qtc_plugin(QmlDesignerBase
     qmldesignerbaseplugin.cpp qmldesignerbaseplugin.h
 )
 
+extend_qtc_plugin(QmlDesignerBase
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 extend_qtc_plugin(QmlDesignerBase
   PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/utils
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/utils
diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt
index 7e2d30ce85b..3b7209d05c7 100644
--- a/src/plugins/qmlprojectmanager/CMakeLists.txt
+++ b/src/plugins/qmlprojectmanager/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_plugin(QmlProjectManager
   CONDITION TARGET Qt5::QuickWidgets
-  PROPERTIES COMPILE_WARNING_AS_ERROR ON
   PLUGIN_CLASS QmlProjectPlugin
   DEPENDS QmlJS Qt5::QuickWidgets Utils
   PLUGIN_DEPENDS Core ProjectExplorer QtSupport QmlDesignerBase
@@ -26,6 +25,11 @@ add_qtc_plugin(QmlProjectManager
     "${PROJECT_SOURCE_DIR}/src/share/3rdparty/studiofonts/studiofonts.qrc"
 )
 
+extend_qtc_plugin(QmlProjectManager
+    CONDITION NOT DISABLE_COMPILE_WARNING_AS_ERROR
+    PROPERTIES COMPILE_WARNING_AS_ERROR ON
+)
+
 extend_qtc_plugin(QmlProjectManager
   PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/buildsystem
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/buildsystem