diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 13:24:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 21:28:11 +0100 |
| commit | 34304e3100883187ca658b8c983af21549496b43 (patch) | |
| tree | 5c2e8216740e4ad4e9efc6010539c3a6cfbbbf8e /tests/auto/corelib/kernel/qmetatype | |
| parent | 1e9dc3ec2f254c711149f8c0376f0403df9b4650 (diff) | |
Get rid of Q_COMPILER_CONSTEXPR checks
Is required now.
Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel/qmetatype')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index a074ca5a51..f3d95285dc 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -2182,7 +2182,6 @@ struct RegisterMetaTypeStruct<qRegisterMetaType< Name >()> \ enum { Value = qRegisterMetaType< Name >() }; \ }; -#if defined(Q_COMPILER_CONSTEXPR) QT_FOR_EACH_STATIC_TYPE(METATYPE_ID_STRUCT) QT_FOR_EACH_STATIC_TYPE(REGISTER_METATYPE_STRUCT) @@ -2197,11 +2196,9 @@ struct RegisterMetaTypeStructDefaultTemplateValue { enum { Value }; }; -#endif void tst_QMetaType::constexprMetaTypeIds() { -#if defined(Q_COMPILER_CONSTEXPR) int id = 0; int metaType; @@ -2217,9 +2214,6 @@ void tst_QMetaType::constexprMetaTypeIds() default:; } Q_UNUSED(metaType); -#else - QSKIP("The test needs a compiler supporting constexpr"); -#endif } void tst_QMetaType::constRefs() @@ -2228,9 +2222,7 @@ void tst_QMetaType::constRefs() QCOMPARE(::qMetaTypeId<const QString &>(), ::qMetaTypeId<QString>()); QCOMPARE(::qMetaTypeId<const CustomMovable &>(), ::qMetaTypeId<CustomMovable>()); QCOMPARE(::qMetaTypeId<const QList<CustomMovable> &>(), ::qMetaTypeId<QList<CustomMovable> >()); -#if defined(Q_COMPILER_CONSTEXPR) static_assert(::qMetaTypeId<const int &>() == ::qMetaTypeId<int>()); -#endif } struct CustomConvertibleType |