diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2021-04-09 13:10:38 +0800 |
|---|---|---|
| committer | JiDe Zhang <zhangjide@uniontech.com> | 2021-04-12 10:03:26 +0800 |
| commit | c9bbc025f01eebd035c757775deaea40eb76ee3e (patch) | |
| tree | ffbfd8b00bdf21e526afe8d1bb709b05a923e3b3 /src/corelib/global/qglobal.h | |
| parent | 5f31da62bb45303b9a0f37a98c018aa710809158 (diff) | |
Add "QT_DEPRECATED_VERSION_XXX" macros
Since 6.3 to 6.6, for which version add "QT_DEPRECATED_VERSION_X_6_"
and "QT_DEPRECATED_VERSION_6_" macro.
Change-Id: I10c77b1ed436ce3442960f5594f86a3a3be181f2
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2fadc6d83b..aa9f26e982 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -392,6 +392,38 @@ typedef double qreal; # define QT_DEPRECATED_VERSION_6_2 #endif +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 3, 0) +# define QT_DEPRECATED_VERSION_X_6_3(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_3 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_3(text) +# define QT_DEPRECATED_VERSION_6_3 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 4, 0) +# define QT_DEPRECATED_VERSION_X_6_4(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_4 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_4(text) +# define QT_DEPRECATED_VERSION_6_4 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 5, 0) +# define QT_DEPRECATED_VERSION_X_6_5(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_5 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_5(text) +# define QT_DEPRECATED_VERSION_6_5 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 6, 0) +# define QT_DEPRECATED_VERSION_X_6_6(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_6 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_6(text) +# define QT_DEPRECATED_VERSION_6_6 +#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) |