From 29c2a6059fd1e086e4522f0496d0fa4668e8c4d1 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 25 Feb 2021 12:45:40 +0100 Subject: [PATCH] Add the 6.2 deprecation macros ... which makes me wonder, why isn't this stuff bumped automatically when a minor version branch is created? Change-Id: Ia43f898163a4baa0896a09bd13d65cf534fe1df5 Reviewed-by: Volker Hilsheimer Reviewed-by: Edward Welbourne --- src/corelib/global/qglobal.h | 8 ++++++++ 1 file changed, 8 insertions(+) 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)