diff options
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 56cf25bb38..f1d4a8a51d 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -715,15 +715,9 @@ #ifdef Q_COMPILER_EXPLICIT_OVERRIDES # define Q_DECL_OVERRIDE override # define Q_DECL_FINAL final -# ifdef Q_COMPILER_DECLTYPE // required for class-level final to compile in qvariant_p.h -# define Q_DECL_FINAL_CLASS final -# else -# define Q_DECL_FINAL_CLASS -# endif #else # define Q_DECL_OVERRIDE # define Q_DECL_FINAL -# define Q_DECL_FINAL_CLASS #endif #ifdef Q_COMPILER_NOEXCEPT diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index c680297854..2e561c1583 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -271,11 +271,11 @@ class QVariantIsNull Q_STATIC_ASSERT(!HasIsNullMethod<SelfTest2>::Value); struct SelfTest3 : public SelfTest1 {}; Q_STATIC_ASSERT(HasIsNullMethod<SelfTest3>::Value); - struct SelfTestFinal1 Q_DECL_FINAL_CLASS { bool isNull() const; }; + struct SelfTestFinal1 Q_DECL_FINAL { bool isNull() const; }; Q_STATIC_ASSERT(HasIsNullMethod<SelfTestFinal1>::Value); - struct SelfTestFinal2 Q_DECL_FINAL_CLASS {}; + struct SelfTestFinal2 Q_DECL_FINAL {}; Q_STATIC_ASSERT(!HasIsNullMethod<SelfTestFinal2>::Value); - struct SelfTestFinal3 Q_DECL_FINAL_CLASS : public SelfTest1 {}; + struct SelfTestFinal3 Q_DECL_FINAL : public SelfTest1 {}; Q_STATIC_ASSERT(HasIsNullMethod<SelfTestFinal3>::Value); template<typename T, bool HasIsNull = HasIsNullMethod<T>::Value> |