diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 | ||||
| -rw-r--r-- | 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 |