From 089f494953efcd7724c5c74beaf6e0c2d1413d96 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Sun, 13 Oct 2024 13:30:13 +0200
Subject: [PATCH] Add deprecation macros for 6.12 and 6.13

This is required for upcoming changes in qtnetworkauth

Change-Id: I9b0547cacddcee6afc352e124043314b048db692
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
---
 src/corelib/CMakeLists.txt                |  2 +-
 src/corelib/global/qtdeprecationmarkers.h | 28 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index e26dcfb326a..6594de3acd0 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -1568,7 +1568,7 @@ function(qt_internal_library_deprecation_level)
             set(QT_DISABLE_DEPRECATED_UP_TO "0x050000")
         endif()
     elseif(NOT QT_DISABLE_DEPRECATED_UP_TO MATCHES "^0x[0-9][0-9][0-9][0-9][0-9][0-9]$")
-        message(FATAL_ERROR "Ivalid format of the QT_DISABLE_DEPRECATED_UP_TO macro:"
+        message(FATAL_ERROR "Invalid format of the QT_DISABLE_DEPRECATED_UP_TO macro:"
             " ${QT_DISABLE_DEPRECATED_UP_TO}. The expected format is the hexadecimal number,"
             " e.g. 0x060102")
     endif()
diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h
index b985e7708ef..eaf3e7d67f4 100644
--- a/src/corelib/global/qtdeprecationmarkers.h
+++ b/src/corelib/global/qtdeprecationmarkers.h
@@ -199,6 +199,22 @@ QT_BEGIN_NAMESPACE
 # define QT_DEPRECATED_VERSION_6_11
 #endif
 
+#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 12, 0)
+# define QT_DEPRECATED_VERSION_X_6_12(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_6_12         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_6_12(text)
+# define QT_DEPRECATED_VERSION_6_12
+#endif
+
+#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 13, 0)
+# define QT_DEPRECATED_VERSION_X_6_13(text) QT_DEPRECATED_X(text)
+# define QT_DEPRECATED_VERSION_6_13         QT_DEPRECATED
+#else
+# define QT_DEPRECATED_VERSION_X_6_13(text)
+# define QT_DEPRECATED_VERSION_6_13
+#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)
 
@@ -307,6 +323,18 @@ QT_BEGIN_NAMESPACE
 # define QT_IF_DEPRECATED_SINCE_6_11(whenTrue, whenFalse) whenTrue
 #endif
 
+#if QT_DEPRECATED_SINCE(6, 12)
+# define QT_IF_DEPRECATED_SINCE_6_12(whenTrue, whenFalse) whenFalse
+#else
+# define QT_IF_DEPRECATED_SINCE_6_12(whenTrue, whenFalse) whenTrue
+#endif
+
+#if QT_DEPRECATED_SINCE(6, 13)
+# define QT_IF_DEPRECATED_SINCE_6_13(whenTrue, whenFalse) whenFalse
+#else
+# define QT_IF_DEPRECATED_SINCE_6_13(whenTrue, whenFalse) whenTrue
+#endif
+
 #ifdef __cplusplus
 // A tag to help mark stuff deprecated (cf. QStringViewLiteral)
 namespace QtPrivate {