AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move definition of QT_MOC_COMPAT from qgloabl.h to qtconfigmacros.h

Browse Source 
Task-number: QTBUG-99313
Change-Id: I331aa5f1805a7e774d0fe8b819720c17767670b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Sona Kurazyan 2022-08-22 17:02:23 +02:00
parent 48aa320569
commit 713f1c633a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qglobal.h
View File

@ -63,14 +63,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT;
#if defined(__cplusplus)
/* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT
# define QT_MOC_COMPAT
#else
# undef QT_MOC_COMPAT
# define QT_MOC_COMPAT
#endif
#ifdef QT_ASCII_CAST_WARNINGS
# define QT_ASCII_CAST_WARN \
Q_DECL_DEPRECATED_X("Use fromUtf8, QStringLiteral, or QLatin1StringView")

8
src/corelib/global/qtconfigmacros.h
View File

@ -61,6 +61,14 @@
#define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1)
#define QT_REQUIRE_CONFIG(feature) Q_STATIC_ASSERT_X(QT_FEATURE_##feature == 1, "Required feature " #feature " for file " __FILE__ " not available.")
/* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT
# define QT_MOC_COMPAT
#else
# undef QT_MOC_COMPAT
# define QT_MOC_COMPAT
#endif
// valid for both C and C++
#define QT_MANGLE_NAMESPACE0(x) x
#define QT_MANGLE_NAMESPACE1(a, b) a##_##b