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 /src/corelib/kernel/qmetatype.cpp | |
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 'src/corelib/kernel/qmetatype.cpp')
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 18b17d9aea..080dbd718a 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -165,7 +165,6 @@ struct DefinedTypesFilter { \value UChar \c{unsigned char} \value Float \c float \value QObjectStar QObject * - \value QWidgetStar QWidget * \value QVariant QVariant \value QCursor QCursor @@ -604,7 +603,7 @@ int QMetaType::registerNormalizedTypedef(const NS(QByteArray) &normalizedTypeNam bool QMetaType::isRegistered(int type) { // predefined type - if ((type >= FirstCoreType && type <= LastCoreType) + if ((type >= FirstCoreType && type <= LastCoreType && type != 40) // 40 is the type that QWidgetStar used to be || (type >= FirstGuiType && type <= LastGuiType) || (type >= FirstWidgetsType && type <= LastWidgetsType)) { return true; @@ -693,7 +692,6 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) case QMetaType::Void: case QMetaType::VoidStar: case QMetaType::QObjectStar: - case QMetaType::QWidgetStar: case QMetaType::QModelIndex: case QMetaType::QJsonValue: case QMetaType::QJsonObject: @@ -911,7 +909,6 @@ bool QMetaType::load(QDataStream &stream, int type, void *data) case QMetaType::Void: case QMetaType::VoidStar: case QMetaType::QObjectStar: - case QMetaType::QWidgetStar: case QMetaType::QModelIndex: case QMetaType::QJsonValue: case QMetaType::QJsonObject: |