Remove v8engine dependency in toVariant conversions

Change-Id: I0f2f77c9cc268a0c5ca3ffe0cd66fc98bb1964b3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index 8525aedb6c..0a90be9cda 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -421,11 +421,10 @@ QJSValue QJSEngine::create(int type, const void *ptr)
 bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr)
 {
     QJSValuePrivate *vp = QJSValuePrivate::get(value);
-    QV8Engine *engine = vp->engine ? vp->engine->v8Engine : 0;
-    if (engine) {
-        QV4::Scope scope(engine->m_v4Engine);
-        QV4::ScopedValue v(scope, vp->getValue(engine->m_v4Engine));
-        return engine->metaTypeFromJS(v, type, ptr);
+    if (vp->engine) {
+        QV4::Scope scope(vp->engine);
+        QV4::ScopedValue v(scope, vp->getValue(scope.engine));
+        return QV8Engine::metaTypeFromJS(scope.engine, v, type, ptr);
     } else if (vp->value.isEmpty()) {
         if (vp->unboundData.userType() == QMetaType::QString) {
             QString string = vp->unboundData.toString();