summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qwidgetsvariant
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/kernel/qwidgetsvariant')
-rw-r--r--tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp7
1 files changed, 3 insertions, 4 deletions
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);