feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Disable warnings-as-errors by default

Browse Source 
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>
This commit is contained in:
Eike Ziller
2023-06-27 11:43:07 +02:00
parent 94a704bb87
commit d1649b060b
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -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
)

14
src/plugins/qmldesignerbase/CMakeLists.txt
View File

@@ -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
)

2
src/plugins/qmlprojectmanager/CMakeLists.txt
View File

@@ -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
)