diff options
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qml/testobject.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 06243df..e5be207 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -638,11 +638,11 @@ QVariant QMetaObjectPublisher::unwrapList(QVariantList list) const QVariant QMetaObjectPublisher::unwrapVariant(const QVariant &value) const { - switch (value.type()) + switch (value.metaType().id()) { - case QVariant::List: + case QMetaType::QVariantList: return unwrapList(value.toList()); - case QVariant::Map: + case QMetaType::QVariantMap: return unwrapMap(value.toMap()); default: break; diff --git a/tests/auto/qml/testobject.cpp b/tests/auto/qml/testobject.cpp index bd9db04..2686826 100644 --- a/tests/auto/qml/testobject.cpp +++ b/tests/auto/qml/testobject.cpp @@ -79,15 +79,15 @@ QString TestObject::testOverload(const QString &str, int i) int TestObject::testVariantType(const QVariant &val) { - return val.type(); + return val.metaType().id(); } bool TestObject::testEmbeddedObjects(const QVariantList &list) { return list.size() == 2 && - QMetaType::Type(list[0].type()) == QMetaType::QObjectStar && - QMetaType::Type(list[1].type()) == QMetaType::QVariantMap && - QMetaType::Type(list[1].toMap()["obj"].type()) == QMetaType::QObjectStar; + list[0].metaType().id() == QMetaType::QObjectStar && + list[1].metaType().id() == QMetaType::QVariantMap && + list[1].toMap()["obj"].metaType().id() == QMetaType::QObjectStar; } QT_END_NAMESPACE |