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.h | |
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.h')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 7c32ce744e..a40bd77e5a 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -113,8 +113,7 @@ QT_BEGIN_NAMESPACE F(QJsonDocument, 48, QJsonDocument) \ #define QT_FOR_EACH_STATIC_CORE_POINTER(F)\ - F(QObjectStar, 39, QObject*) \ - F(QWidgetStar, 40, QWidget*) \ + F(QObjectStar, 39, QObject*) #define QT_FOR_EACH_STATIC_CORE_TEMPLATE(F)\ F(QVariantMap, 8, QVariantMap) \ @@ -233,7 +232,7 @@ public: QRegularExpression = 44, QJsonValue = 45, QJsonObject = 46, QJsonArray = 47, QJsonDocument = 48, SChar = 49, - QObjectStar = 39, QWidgetStar = 40, + QObjectStar = 39, Void = 43, QVariantMap = 8, QVariantList = 9, QVariantHash = 28, QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, @@ -448,11 +447,6 @@ namespace QtPrivate { enum { Value = true }; }; - template<> - struct IsPointerToTypeDerivedFromQObject<QWidget*> - { - enum { Value = true }; - }; template<typename T> struct IsPointerToTypeDerivedFromQObject<T*> @@ -480,14 +474,6 @@ namespace QtPrivate static inline const QMetaObject *value() { return &T::staticMetaObject; } }; - Q_CORE_EXPORT const QMetaObject *metaObjectForQWidget(); - - template<> - struct MetaObjectForType<QWidget*, /* isPointerToTypeDerivedFromQObject = */ true> - { - static const QMetaObject *value() { return metaObjectForQWidget(); } - }; - template<typename T> struct IsSharedPointerToTypeDerivedFromQObject { |