From cfa7d41db08a288dc7a76d56b0b33de68a5f01b8 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Tue, 24 Dec 2024 14:20:54 +0200 Subject: [PATCH] qtdeprecationmarkers: add deprecation macros for 6.14 Will be used in a subsequent commit in QString. Change-Id: I3f2a15c2b15c6558b61e2365a2cabc9a989b0940 Reviewed-by: Thiago Macieira --- src/corelib/global/qtdeprecationmarkers.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h index 46124873c85..00263f02d2e 100644 --- a/src/corelib/global/qtdeprecationmarkers.h +++ b/src/corelib/global/qtdeprecationmarkers.h @@ -249,6 +249,14 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_13 #endif +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 14, 0) +# define QT_DEPRECATED_VERSION_X_6_14(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_6_14 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_6_14(text) +# define QT_DEPRECATED_VERSION_6_14 +#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)