Qt6 incompatibilities fixed

This commit is contained in:
Uwe Rathmann 2020-10-28 12:33:26 +01:00
parent 1efbd02dda
commit 1eada5fbe0
2 changed files with 2 additions and 2 deletions

View File

@ -28,7 +28,7 @@
#define QSK_NAMESPACE( name ) namespace name #define QSK_NAMESPACE( name ) namespace name
#define QSK_ENUM( name ) \ #define QSK_ENUM( name ) \
inline const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \ inline constexpr const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \
inline constexpr const char* qt_getEnumName(name) noexcept { return #name; } inline constexpr const char* qt_getEnumName(name) noexcept { return #name; }
#endif #endif

View File

@ -23,7 +23,7 @@
#define QSK_NAMESPACE( name ) namespace name #define QSK_NAMESPACE( name ) namespace name
#define QSK_ENUM( name ) \ #define QSK_ENUM( name ) \
inline const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \ inline constexpr const QMetaObject* qt_getEnumMetaObject(name) noexcept { return &staticMetaObject; } \
inline constexpr const char* qt_getEnumName(name) noexcept { return #name; } inline constexpr const char* qt_getEnumName(name) noexcept { return #name; }
#endif #endif