CMake: Fix deprecation defines not being set properly
Instead of propagating the deprecation wranings, we compiled all code with -Ddeprecations. Change-Id: I0233ddc85bdbdcb93d366073b2cea5d47bdbe52a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
parent
6f265faa17
commit
419db858f5
@ -142,7 +142,7 @@ function(qt_internal_library_deprecation_level result)
|
||||
list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x050000")
|
||||
endif()
|
||||
list(APPEND deprecations "QT_DEPRECATED_WARNINGS_SINCE=0x060000")
|
||||
set("${result}" deprecations PARENT_SCOPE)
|
||||
set("${result}" "${deprecations}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Sets the exceptions flags for the given target
|
||||
|
@ -331,7 +331,7 @@ function(qt_internal_add_module target)
|
||||
QT_DEPRECATED_WARNINGS
|
||||
QT_BUILDING_QT
|
||||
QT_BUILD_${module_define}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore
|
||||
"${deprecation_define}"
|
||||
${deprecation_define}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -174,7 +174,7 @@ function(qt_internal_add_plugin target)
|
||||
DEFINES
|
||||
${arg_DEFINES}
|
||||
QT_DEPRECATED_WARNINGS
|
||||
"${deprecation_define}"
|
||||
${deprecation_define}
|
||||
"${static_plugin_define}"
|
||||
QT_PLUGIN
|
||||
PUBLIC_DEFINES
|
||||
|
Loading…
Reference in New Issue
Block a user