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/qwidgetmetatype | |
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/qwidgetmetatype')
-rw-r--r-- | tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |