diff options
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 5e9e20b416..ee124aeed0 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -413,8 +413,8 @@ QV4::ReturnedValue QV8Engine::fromVariant(const QVariant &variant) break; } - if (QQmlValueType *vt = QQmlValueTypeFactory::valueType(type)) - return QV4::QmlValueTypeWrapper::create(this, variant, vt); + if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(type)) + return QV4::QmlValueTypeWrapper::create(this, variant, vtmo, type); } else { QV4::Scope scope(m_v4Engine); if (type == qMetaTypeId<QQmlListReference>()) { @@ -454,8 +454,8 @@ QV4::ReturnedValue QV8Engine::fromVariant(const QVariant &variant) if (succeeded) return retn.asReturnedValue(); - if (QQmlValueType *vt = QQmlValueTypeFactory::valueType(type)) - return QV4::QmlValueTypeWrapper::create(this, variant, vt); + if (const QMetaObject *vtmo = QQmlValueTypeFactory::metaObjectForMetaType(type)) + return QV4::QmlValueTypeWrapper::create(this, variant, vtmo, type); } // XXX TODO: To be compatible, we still need to handle: |