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/qvariant.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/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 4b582affb3..8c38259276 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1074,8 +1074,7 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names Usually, you never have to use this constructor, use QVariant::fromValue() instead to construct variants from the pointer types represented by - \c QMetaType::VoidStar, \c QMetaType::QObjectStar and - \c QMetaType::QWidgetStar. + \c QMetaType::VoidStar, and \c QMetaType::QObjectStar. \sa QVariant::fromValue(), Type */ @@ -2724,7 +2723,6 @@ bool QVariant::canConvert(int targetTypeId) const case QMetaType::Short: case QMetaType::UShort: return qCanConvertMatrix[QVariant::Int] & (1 << currentType) || currentType == QVariant::Int; - case QMetaType::QWidgetStar: case QMetaType::QObjectStar: return canConvertMetaObject(currentType, targetTypeId, d.data.o); default: |