diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 36 | ||||
| -rw-r--r-- | src/corelib/global/qtdeprecationmarkers.h | 17 |
2 files changed, 34 insertions, 19 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 diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h index 858b00601b..dc203a1e47 100644 --- a/src/corelib/global/qtdeprecationmarkers.h +++ b/src/corelib/global/qtdeprecationmarkers.h @@ -36,16 +36,21 @@ QT_BEGIN_NAMESPACE # define Q_DECL_ENUMERATOR_DEPRECATED #endif +// If the deprecated macro is defined, use its value +#if !defined(QT_DISABLE_DEPRECATED_UP_TO) && defined(QT_DISABLE_DEPRECATED_BEFORE) +# define QT_DISABLE_DEPRECATED_UP_TO QT_DISABLE_DEPRECATED_BEFORE +#endif + #ifndef QT_DEPRECATED_WARNINGS_SINCE -# ifdef QT_DISABLE_DEPRECATED_BEFORE -# define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_BEFORE +# ifdef QT_DISABLE_DEPRECATED_UP_TO +# define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_UP_TO # else # define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION # endif #endif -#ifndef QT_DISABLE_DEPRECATED_BEFORE -#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0) +#ifndef QT_DISABLE_DEPRECATED_UP_TO +#define QT_DISABLE_DEPRECATED_UP_TO QT_VERSION_CHECK(5, 0, 0) #endif /* @@ -61,7 +66,7 @@ QT_BEGIN_NAMESPACE */ #ifdef QT_DEPRECATED -#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_BEFORE) +#define QT_DEPRECATED_SINCE(major, minor) (QT_VERSION_CHECK(major, minor, 0) > QT_DISABLE_DEPRECATED_UP_TO) #else #define QT_DEPRECATED_SINCE(major, minor) 0 #endif @@ -186,7 +191,7 @@ QT_BEGIN_NAMESPACE /* QT_IF_DEPRECATED_SINCE(major, minor, whenTrue, whenFalse) expands to \a whenTrue if the specified (\a major, \a minor) version is less than or - equal to the deprecation version defined by QT_DISABLE_DEPRECATED_BEFORE, + equal to the deprecation version defined by QT_DISABLE_DEPRECATED_UP_TO, and to \a whenFalse otherwise. Currently used for QT_INLINE_SINCE(maj, min), but can also be helpful for |