diff options
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qcolor/tst_qcolor.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp index f0c5bf79a7..c1ef8e2a60 100644 --- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -87,16 +87,16 @@ private slots: namespace { template <typename T> struct static_assert_trigger { - Q_STATIC_ASSERT(( QMetaTypeId2<T>::IsBuiltIn )); + static_assert(( QMetaTypeId2<T>::IsBuiltIn )); enum { value = true }; }; } #define CHECK_BUILTIN(TYPE, ID) static_assert_trigger< TYPE >::value && -Q_STATIC_ASSERT(( FOR_EACH_GUI_METATYPE(CHECK_BUILTIN) true )); +static_assert(( FOR_EACH_GUI_METATYPE(CHECK_BUILTIN) true )); #undef CHECK_BUILTIN -Q_STATIC_ASSERT((!QMetaTypeId2<QList<QPen> >::IsBuiltIn)); -Q_STATIC_ASSERT((!QMetaTypeId2<QMap<QString,QPen> >::IsBuiltIn)); +static_assert((!QMetaTypeId2<QList<QPen> >::IsBuiltIn)); +static_assert((!QMetaTypeId2<QMap<QString,QPen> >::IsBuiltIn)); template <int ID> struct MetaEnumToType {}; diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp index 5bbf60ea79..eceb525ad0 100644 --- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp +++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp @@ -1784,7 +1784,7 @@ void tst_QColor::qrgba64MemoryLayout() QCOMPARE(rgb64.alpha(), quint16(0xcdef)); // Check in-memory order, so it can be used by things like SSE - Q_STATIC_ASSERT(sizeof(QRgba64) == sizeof(quint64)); + static_assert(sizeof(QRgba64) == sizeof(quint64)); quint16 memory[4]; memcpy(memory, &rgb64, sizeof(QRgba64)); QCOMPARE(memory[0], quint16(0x0123)); |