From 9ecc119276e3741b2b71f2513510f583a3f92635 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 22 Aug 2022 17:11:56 +0200 Subject: [PATCH] Move QT_ASCII_CAST_WARN macro from qglobal.h to qtdeprecationmarkers.h Task-number: QTBUG-99313 Change-Id: I6449f519db3f67ed3d390295b8fa93eff28d7cda Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne --- src/corelib/global/qglobal.h | 7 ------- src/corelib/global/qtdeprecationmarkers.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9ae45ec8ab..65bb2b35a4 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -63,13 +63,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT; #if defined(__cplusplus) -#ifdef QT_ASCII_CAST_WARNINGS -# define QT_ASCII_CAST_WARN \ - Q_DECL_DEPRECATED_X("Use fromUtf8, QStringLiteral, or QLatin1StringView") -#else -# define QT_ASCII_CAST_WARN -#endif - /* Utility macros and inline functions */ diff --git a/src/corelib/global/qtdeprecationmarkers.h b/src/corelib/global/qtdeprecationmarkers.h index d3fa1d05bd..e3b17fef28 100644 --- a/src/corelib/global/qtdeprecationmarkers.h +++ b/src/corelib/global/qtdeprecationmarkers.h @@ -299,6 +299,13 @@ constexpr inline Deprecated_t Deprecated = {}; } #endif +#ifdef QT_ASCII_CAST_WARNINGS +# define QT_ASCII_CAST_WARN \ + Q_DECL_DEPRECATED_X("Use fromUtf8, QStringLiteral, or QLatin1StringView") +#else +# define QT_ASCII_CAST_WARN +#endif + QT_END_NAMESPACE #endif // QTDEPRECATIONMARKERS_H