diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index 600f28814f5..072e802d36c 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
 )
 
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
 )
 
diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt
index df2357e106d..a1212e8bc15 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) AND ($<CONFIG:Debug> OR WITH_TESTS)
+    CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
     PROPERTIES COMPILE_WARNING_AS_ERROR ON
 )