Move QT_ASCII_CAST_WARN macro from qglobal.h to qtdeprecationmarkers.h

Task-number: QTBUG-99313
Change-Id: I6449f519db3f67ed3d390295b8fa93eff28d7cda
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Sona Kurazyan 2022-08-22 17:11:56 +02:00
parent db64694b4c
commit 9ecc119276
2 changed files with 7 additions and 7 deletions

View File

@ -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
*/

View File

@ -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