From 1eada5fbe0f57d2be66cf9175764ab0819259720 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 28 Oct 2020 12:33:26 +0100 Subject: [PATCH] Qt6 incompatibilities fixed --- src/common/QskAspect.h | 2 +- src/common/QskNamespace.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/QskAspect.h b/src/common/QskAspect.h index 5c021502..73a3092d 100644 --- a/src/common/QskAspect.h +++ b/src/common/QskAspect.h @@ -28,7 +28,7 @@ #define QSK_NAMESPACE( name ) namespace 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; } #endif diff --git a/src/common/QskNamespace.h b/src/common/QskNamespace.h index b7a4285b..35c2769b 100644 --- a/src/common/QskNamespace.h +++ b/src/common/QskNamespace.h @@ -23,7 +23,7 @@ #define QSK_NAMESPACE( name ) namespace 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; } #endif