diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-16 12:26:25 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-19 23:52:05 +0200 |
| commit | 3226c82740a7ed73b3d0ca39568d8b1c79500963 (patch) | |
| tree | 2504c906816e9ff26c65c615fa9e6e9d166508c8 /cmake | |
| parent | b9baa42b62b7ae34dabd54592cb12be6e2b18b35 (diff) | |
Rename QT_DISABLE_DEPRECATED_BEFORE -> QT_DISABLE_DEPRECATED_UP_TO
The new name describes the behavior in a better way.
[ChangeLog][Build System] The QT_DISABLE_DEPRECATED_BEFORE macro is
renamed to QT_DISABLE_DEPRECATED_UP_TO. The old name is deprecated, but
is still recognized if it is defined during configuration and the new
name is not defined.
Task-number: QTBUG-104944
Change-Id: Ifc34323e0bbd9e3dc2f86c3e80d4d0940ebccbb8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index 43371cd176..34a9bf7e75 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -180,16 +180,16 @@ function(qt_internal_apply_intel_cet target visibility) endfunction() function(qt_internal_library_deprecation_level result) - # QT_DISABLE_DEPPRECATED_BEFORE controls which version we use as a cut-off + # QT_DISABLE_DEPRECATED_UP_TO controls which version we use as a cut-off # compiling in to the library. E.g. if it is set to QT_VERSION then no # code which was deprecated before QT_VERSION will be compiled in. if(WIN32) # On Windows, due to the way DLLs work, we need to export all functions, # including the inlines - list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x040800") + list(APPEND deprecations "QT_DISABLE_DEPRECATED_UP_TO=0x040800") else() # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API - list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x050000") + list(APPEND deprecations "QT_DISABLE_DEPRECATED_UP_TO=0x050000") endif() # QT_DEPRECATED_WARNINGS_SINCE controls the upper-bound of deprecation # warnings that are emitted. E.g. if it is set to 7.0 then all deprecations |