diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 3 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qmetatype/typeFlags.bin | bin | 146 -> 144 bytes | |||
-rw-r--r-- | tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp | 4 | ||||
-rw-r--r-- | tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp | 7 |
4 files changed, 5 insertions, 9 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index b251761415..1d559af22c 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -498,9 +498,6 @@ template<> struct TestValueFactory<QMetaType::Float> { template<> struct TestValueFactory<QMetaType::QObjectStar> { static QObject * *create() { return new QObject *(0); } }; -template<> struct TestValueFactory<QMetaType::QWidgetStar> { - static QWidget * *create() { return new QWidget *(0); } -}; template<> struct TestValueFactory<QMetaType::VoidStar> { static void * *create() { return new void *(0); } }; diff --git a/tests/auto/corelib/kernel/qmetatype/typeFlags.bin b/tests/auto/corelib/kernel/qmetatype/typeFlags.bin Binary files differindex cf83e9419e..dee0983775 100644 --- a/tests/auto/corelib/kernel/qmetatype/typeFlags.bin +++ b/tests/auto/corelib/kernel/qmetatype/typeFlags.bin diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp index f92a4fd5cd..fbfa018cef 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp +++ b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp @@ -68,14 +68,14 @@ public: }; Q_STATIC_ASSERT(( QMetaTypeId2<QSizePolicy>::IsBuiltIn)); -Q_STATIC_ASSERT(( QMetaTypeId2<QWidget*>::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); + QCOMPARE(QMetaType::metaObjectForType(qMetaTypeId<QWidget*>()), &QWidget::staticMetaObject); QCOMPARE(QMetaType::metaObjectForType(qMetaTypeId<QLabel*>()), &QLabel::staticMetaObject); QCOMPARE(QMetaType::metaObjectForType(qMetaTypeId<CustomWidget*>()), &CustomWidget::staticMetaObject); } diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp index 90238b5d9b..a5e33c41c9 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp +++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp @@ -198,11 +198,10 @@ void tst_QWidgetsVariant::qvariant_cast_QObject() QCOMPARE(data.userType(), int(QMetaType::QObjectStar)); QVERIFY(data.canConvert<QWidget*>()); - QVERIFY(data.canConvert(QMetaType::QWidgetStar)); QVERIFY(data.canConvert(::qMetaTypeId<QWidget*>())); QVERIFY(data.value<QWidget*>()); - QVERIFY(data.convert(QMetaType::QWidgetStar)); - QCOMPARE(data.userType(), int(QMetaType::QWidgetStar)); + QVERIFY(data.convert(qMetaTypeId<QWidget*>())); + QCOMPARE(data.userType(), qMetaTypeId<QWidget*>()); } else { QVERIFY(!data.canConvert<QObject*>()); QVERIFY(!data.canConvert(QMetaType::QObjectStar)); @@ -219,7 +218,7 @@ void tst_QWidgetsVariant::qvariant_cast_QObject_derived() CustomQWidget customWidget; QWidget *widget = &customWidget; QVariant data = QVariant::fromValue(widget); - QVERIFY(data.userType() == QMetaType::QWidgetStar); + QVERIFY(data.userType() == qMetaTypeId<QWidget*>()); QCOMPARE(data.value<QObject*>(), widget); QCOMPARE(data.value<QWidget*>(), widget); |