From dac9548a67364eb1edd9ed6805369deac67ab9b1 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 19 Apr 2020 23:10:40 +0200 Subject: [PATCH] Add the Qt 6.0 deprecation macros Change-Id: I9146129b1f772c3b028ae782f189aa4421f64b73 Reviewed-by: Lars Knoll --- src/corelib/global/qglobal.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c1fcc12cfb..31f482dd8d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -371,11 +371,19 @@ typedef double qreal; # define QT_DEPRECATED_VERSION_5_15 #endif +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 0, 0) +# define QT_DEPRECATED_VERSION_X_6_0(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_0 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_0(text) +# define QT_DEPRECATED_VERSION_6_0 +#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) +#define QT_DEPRECATED_VERSION_X(major, minor, text) QT_DEPRECATED_VERSION_X_##major##_##minor(text) #define QT_DEPRECATED_VERSION_5(minor) QT_DEPRECATED_VERSION_5_##minor -#define QT_DEPRECATED_VERSION(major, minor) QT_DEPRECATED_VERSION_##major(minor) +#define QT_DEPRECATED_VERSION(major, minor) QT_DEPRECATED_VERSION_##major##_##minor #ifdef __cplusplus // A tag to help mark stuff deprecated (cf. QStringViewLiteral)