From 18f0484a0ed9785efe5acb4671695772e5715075 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 16 Aug 2022 12:52:42 +0200 Subject: [PATCH] Rename QT_DEPRECATED_WARNINGS_SINCE -> QT_WARN_DEPRECATED_UP_TO The new name describes the behavior in a better way. [ChangeLog][Build System] The QT_DEPRECATED_WARNINGS_SINCE macro is renamed to QT_WARN_DEPRECATED_UP_TO. The old name is deprecated, but is still recognized if it is defined during configuration and the new name is not defined. Fixes: QTBUG-104944 Change-Id: I320c033010dfab120db6922598454f95169657f7 Reviewed-by: Edward Welbourne Reviewed-by: Alexandru Croitor --- cmake/QtFlagHandlingHelpers.cmake | 8 ++--- src/corelib/global/qtdeprecationmarkers.h | 43 +++++++++++++---------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index 34a9bf7e75c..fe9e0e072ae 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -191,10 +191,10 @@ function(qt_internal_library_deprecation_level result) # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API list(APPEND deprecations "QT_DISABLE_DEPRECATED_UP_TO=0x050000") endif() - # QT_DEPRECATED_WARNINGS_SINCE controls the upper-bound of deprecation - # warnings that are emitted. E.g. if it is set to 7.0 then all deprecations - # during the 6.* lifetime will be warned about in Qt builds. - list(APPEND deprecations "QT_DEPRECATED_WARNINGS_SINCE=0x070000") + # QT_WARN_DEPRECATED_UP_TO controls the upper-bound of deprecation + # warnings that are emitted. E.g. if it is set to 0x060500 then all use of + # things deprecated in or before 6.5.0 will be warned against. + list(APPEND deprecations "QT_WARN_DEPRECATED_UP_TO=0x070000") set("${result}" "${deprecations}" PARENT_SCOPE) endfunction() diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h index dc203a1e47b..cde9da3038a 100644 --- a/src/corelib/global/qtdeprecationmarkers.h +++ b/src/corelib/global/qtdeprecationmarkers.h @@ -41,11 +41,16 @@ QT_BEGIN_NAMESPACE # define QT_DISABLE_DEPRECATED_UP_TO QT_DISABLE_DEPRECATED_BEFORE #endif -#ifndef QT_DEPRECATED_WARNINGS_SINCE +// If the deprecated macro is defined, use its value +#if !defined(QT_WARN_DEPRECATED_UP_TO) && defined(QT_DEPRECATED_WARNINGS_SINCE) +# define QT_WARN_DEPRECATED_UP_TO QT_DEPRECATED_WARNINGS_SINCE +#endif + +#ifndef QT_WARN_DEPRECATED_UP_TO # ifdef QT_DISABLE_DEPRECATED_UP_TO -# define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_UP_TO +# define QT_WARN_DEPRECATED_UP_TO QT_DISABLE_DEPRECATED_UP_TO # else -# define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION +# define QT_WARN_DEPRECATED_UP_TO QT_VERSION # endif #endif @@ -73,12 +78,12 @@ QT_BEGIN_NAMESPACE /* QT_DEPRECATED_VERSION(major, minor) and QT_DEPRECATED_VERSION_X(major, minor, text) - outputs a deprecation warning if QT_DEPRECATED_WARNINGS_SINCE is equal or greater + outputs a deprecation warning if QT_WARN_DEPRECATED_UP_TO is equal to or greater than the version specified as major, minor. This makes it possible to deprecate a - function without annoying a user who needs to stick at a specified minimum version - and therefore can't use the new function. + function without annoying a user who needs to stay compatible with a specified minimum + version and therefore can't use the new function. */ -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 12, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 12, 0) # define QT_DEPRECATED_VERSION_X_5_12(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_12 QT_DEPRECATED #else @@ -86,7 +91,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_12 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 13, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 13, 0) # define QT_DEPRECATED_VERSION_X_5_13(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_13 QT_DEPRECATED #else @@ -94,7 +99,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_13 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 14, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 14, 0) # define QT_DEPRECATED_VERSION_X_5_14(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_14 QT_DEPRECATED #else @@ -102,7 +107,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_14 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 15, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(5, 15, 0) # define QT_DEPRECATED_VERSION_X_5_15(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_5_15 QT_DEPRECATED #else @@ -110,7 +115,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_5_15 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 0, 0) +#if QT_WARN_DEPRECATED_UP_TO >= 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 @@ -118,7 +123,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_0 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 1, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 1, 0) # define QT_DEPRECATED_VERSION_X_6_1(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_1 QT_DEPRECATED #else @@ -126,7 +131,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_1 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 2, 0) +#if QT_WARN_DEPRECATED_UP_TO >= 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 @@ -134,7 +139,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_2 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 3, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 3, 0) # define QT_DEPRECATED_VERSION_X_6_3(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_3 QT_DEPRECATED #else @@ -142,7 +147,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_3 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 4, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 4, 0) # define QT_DEPRECATED_VERSION_X_6_4(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_4 QT_DEPRECATED #else @@ -150,7 +155,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_4 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 5, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 5, 0) # define QT_DEPRECATED_VERSION_X_6_5(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_5 QT_DEPRECATED #else @@ -158,7 +163,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_5 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 6, 0) +#if QT_WARN_DEPRECATED_UP_TO >= QT_VERSION_CHECK(6, 6, 0) # define QT_DEPRECATED_VERSION_X_6_6(text) QT_DEPRECATED_X(text) # define QT_DEPRECATED_VERSION_6_6 QT_DEPRECATED #else @@ -166,7 +171,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_6 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 7, 0) +#if QT_WARN_DEPRECATED_UP_TO >= 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 @@ -174,7 +179,7 @@ QT_BEGIN_NAMESPACE # define QT_DEPRECATED_VERSION_6_7 #endif -#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(6, 8, 0) +#if QT_WARN_DEPRECATED_UP_TO >= 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