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 /src/corelib/global/qglobal.cpp | |
| 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 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5d9660830e..bc41309c57 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1527,23 +1527,33 @@ bool qSharedBuild() noexcept */ /*! - \macro QT_DISABLE_DEPRECATED_BEFORE - \relates <QtGlobal> + \macro QT_DISABLE_DEPRECATED_BEFORE + \relates <QtGlobal> + \deprecated [6.5] Use QT_DISABLE_DEPRECATED_UP_TO instead + + \sa QT_DISABLE_DEPRECATED_UP_TO +*/ - This macro can be defined in the project file to disable functions deprecated in - a specified version of Qt or any earlier version. The default version number is 5.0, - meaning that functions deprecated in or before Qt 5.0 will not be included. +/*! + \macro QT_DISABLE_DEPRECATED_UP_TO + \relates <QtGlobal> - For instance, when preparing to upgrade to Qt 6.3, setting - \c{QT_DISABLE_DEPRECATED_BEFORE=0x0602ff} will disable functions deprecated in - Qt 6.2 and earlier, making it easy to find changes worth making before the - upgrade. In any release, set \c{QT_DISABLE_DEPRECATED_BEFORE=0x000000} to - enable all functions, including the ones deprecated in Qt 5.0 (although most - of those have by now been removed entirely). + This macro can be defined in the project file to disable functions + deprecated in a specified version of Qt or any earlier version. The default + version number is 5.0, meaning that functions deprecated in or before + Qt 5.0 will not be included. - \sa QT_DEPRECATED_WARNINGS -*/ + For instance, when preparing to upgrade to Qt 6.3, after eliminating all + deprecation warnings, you can set \c{QT_DISABLE_DEPRECATED_UP_TO=0x060300} + to exclude from your builds the Qt APIs you no longer use. In your own + project's build configuration, this will ensure that anyone adding new calls + to the deprecated APIs will know about it right away. If you also build Qt + for yourself, including this define in your build configuration for Qt will + make your binaries smaller by leaving out even the implementation of the + deprecated APIs. + \sa QT_DEPRECATED_WARNINGS, QT_DISABLE_DEPRECATED_BEFORE +*/ /*! \macro QT_DEPRECATED_WARNINGS |