diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-02-25 12:45:40 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-02 16:55:19 +0000 |
| commit | 49bed939b61ce4e15d927e62d7341bc7258c9d33 (patch) | |
| tree | 2126d6f89c0791e3573005220c4259991821502d /src | |
| parent | 2a5262c0dd9135d0f0bad7a42141696fbb5a7ba2 (diff) | |
| parent | 29c2a6059fd1e086e4522f0496d0fa4668e8c4d1 (diff) | |
Merge "Add the 6.2 deprecation macros"
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 47ffe17034..d546f19cb8 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -374,6 +374,14 @@ typedef double qreal; # define QT_DEPRECATED_VERSION_6_1 #endif +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 2, 0) +# define QT_DEPRECATED_VERSION_X_6_2(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_2 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_2(text) +# define QT_DEPRECATED_VERSION_6_2 +#endif + #define QT_DEPRECATED_VERSION_X_5(minor, text) QT_DEPRECATED_VERSION_X_5_##minor(text) #define QT_DEPRECATED_VERSION_X(major, minor, text) QT_DEPRECATED_VERSION_X_##major##_##minor(text) |