diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-08 10:18:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-15 13:23:08 +0200 |
| commit | 4dcc5f7f8a463123e4c9607e7d98dbbd87c8db5d (patch) | |
| tree | b93ca282dbf2239fde6e8c8d0da38c6a5e7b4a29 | |
| parent | a58ddb4087f0757f7c94a2db2d2226506a38d7a5 (diff) | |
Remove the user of the QWidgetStar metatypeid.
It is to be removed, and is obsoleted by QMetaType::PointerToQObject.
Change-Id: I6832808cfd1e22d6c04c7ba37bf52ff7c36f0272
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| -rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 39f5398a..7786bea4 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -1021,7 +1021,6 @@ bool QDeclarativeMetaType::canCopy(int type) switch(type) { case QMetaType::VoidStar: case QMetaType::QObjectStar: - case QMetaType::QWidgetStar: case QMetaType::Long: case QMetaType::Int: case QMetaType::Short: @@ -1116,7 +1115,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) switch(type) { case QMetaType::VoidStar: case QMetaType::QObjectStar: - case QMetaType::QWidgetStar: *static_cast<void **>(data) = *static_cast<void* const *>(copy); return true; case QMetaType::Long: @@ -1325,7 +1323,6 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) switch(type) { case QMetaType::VoidStar: case QMetaType::QObjectStar: - case QMetaType::QWidgetStar: *static_cast<void **>(data) = 0; return true; case QMetaType::Long: diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index b8db6002..c18ea9d8 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -95,7 +95,6 @@ bool QDeclarativeValueTypeFactory::isValueType(int idx) if ((uint)idx < QVariant::UserType && idx != QVariant::StringList && idx != QMetaType::QObjectStar - && idx != QMetaType::QWidgetStar && idx != QMetaType::VoidStar && idx != QMetaType::QVariant) { return true; diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index 09cbd53e..2cb19844 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -274,9 +274,7 @@ void tst_qdeclarativemetatype::copy() COPY_TEST(float, Float, 10.5, 0); QObject objectValue; - QWidget widgetValue; COPY_TEST(QObject *, QObjectStar, &objectValue, 0); - COPY_TEST(QWidget *, QWidgetStar, &widgetValue, 0); COPY_TEST(qreal, QReal, 10.5, 0); { |