From 651ba6535c4dc707fb9a473f974f0e27bac9eb98 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 4 Apr 2022 14:13:55 +0200 Subject: [PATCH] Add QT_DEPRECATED_VERSION_X macros for 6.7 and 6.8 Change-Id: If905899300280b8a27eb73b62174b8a07337757a Reviewed-by: Thiago Macieira Reviewed-by: Marc Mutz Reviewed-by: Edward Welbourne --- src/corelib/global/qglobal.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index bc13d516e6b..5de3c780c33 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -421,6 +421,22 @@ typedef double qreal; # define QT_DEPRECATED_VERSION_6_6 #endif +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 7, 0) +# define QT_DEPRECATED_VERSION_X_6_7(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_7 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_7(text) +# define QT_DEPRECATED_VERSION_6_7 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 8, 0) +# define QT_DEPRECATED_VERSION_X_6_8(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_8 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_8(text) +# define QT_DEPRECATED_VERSION_6_8 +#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)