diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-19 19:34:17 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-23 20:12:12 +0200 |
| commit | 419db858f5bf73ff59d3c886003727eb7cab8400 (patch) | |
| tree | 8d2373c0dfbfb062e5f686bd29ea57b18bdcafef /cmake | |
| parent | 6f265faa176d6bfc5778a20687a83da698ab6a89 (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPluginHelpers.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index 8b2677aa3d..685c1616b7 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -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 diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 9f32a1309a..6431bba589 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -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() diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 2591705a9e..6b362b5017 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -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 |