diff options
Diffstat (limited to 'tests')
3 files changed, 39 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 8247385b0d..b251761415 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -383,6 +383,25 @@ void tst_QMetaType::typeName() FOR_EACH_PRIMITIVE_METATYPE(F) \ FOR_EACH_COMPLEX_CORE_METATYPE(F) \ +namespace { + template <typename T> + struct static_assert_trigger { + Q_STATIC_ASSERT(( QMetaTypeId2<T>::IsBuiltIn )); + enum { value = true }; + }; +} + +#define CHECK_BUILTIN(MetaTypeName, MetaTypeId, RealType) static_assert_trigger< RealType >::value && +Q_STATIC_ASSERT(( FOR_EACH_CORE_METATYPE(CHECK_BUILTIN) true )); +#undef CHECK_BUILTIN +Q_STATIC_ASSERT(( QMetaTypeId2<QList<QVariant> >::IsBuiltIn)); +Q_STATIC_ASSERT(( QMetaTypeId2<QMap<QString,QVariant> >::IsBuiltIn)); +Q_STATIC_ASSERT(( QMetaTypeId2<QObject*>::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<tst_QMetaType*>::IsBuiltIn)); // QObject subclass +Q_STATIC_ASSERT((!QMetaTypeId2<QList<int> >::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<QMap<int,int> >::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<QMetaType::Type>::IsBuiltIn)); + template <int ID> struct MetaEnumToType {}; diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp index 0514eafa2d..fae999556f 100644 --- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -87,6 +87,20 @@ private slots: F(QVector4D, QVector4D) \ F(QQuaternion, QQuaternion) +namespace { + template <typename T> + struct static_assert_trigger { + Q_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 )); +#undef CHECK_BUILTIN +Q_STATIC_ASSERT((!QMetaTypeId2<QList<QPen> >::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<QMap<QString,QPen> >::IsBuiltIn)); + template <int ID> struct MetaEnumToType {}; diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp index 9d2fd149f4..f92a4fd5cd 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp +++ b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp @@ -67,6 +67,12 @@ public: } }; +Q_STATIC_ASSERT(( QMetaTypeId2<QSizePolicy>::IsBuiltIn)); +Q_STATIC_ASSERT(( QMetaTypeId2<QWidget*>::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<QList<QSizePolicy> >::IsBuiltIn)); +Q_STATIC_ASSERT((!QMetaTypeId2<QMap<QString,QSizePolicy> >::IsBuiltIn)); + + void tst_QWidgetMetaType::metaObject() { QCOMPARE(QMetaType::metaObjectForType(QMetaType::QWidgetStar), &QWidget::staticMetaObject); |