diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-19 14:33:28 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-18 10:55:47 +0200 |
commit | 4d9d88af6ff494f09cfbc376a1f9aa0ea9ca2357 (patch) | |
tree | dec39e6b8c95c71638a1ab492b8098ccd4f7cd77 /tests/auto/widgets/kernel/qwidgetsvariant | |
parent | 33b298427161c51ae39f0dcaf01d6914b7c8b01c (diff) |
Remove QWidgetStar.
This allows us to remove the odd hacks to get the static metaobject
for the QWidget* metatype.
The QWidget* is still an automatic metatype thanks to the QObject
partial template specialization. It is registered as a metatype
at runtime automatically in qwidgetsvariant.cpp.
Change-Id: Ie01b69eadf2cbe87af1a86c3284550f60dcf9e94
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qwidgetsvariant')
-rw-r--r-- | tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp | 7 |
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); |