From 7041eb353a4ad416f51245cc17342e16b3a02a9b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 2 Jan 2015 14:37:26 +0100 Subject: Move the variant conversion methods from qv8engine to qv4::ExecutionEngine Change-Id: Ibd529ae5cc3ba06f46152e9daa9119a4e7a2561c Reviewed-by: Simon Hausmann --- src/qml/jsapi/qjsengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsapi/qjsengine.cpp') diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 49f1dab977..b9283c9d9e 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -410,7 +410,7 @@ QJSValue QJSEngine::create(int type, const void *ptr) { Q_D(QJSEngine); QV4::Scope scope(d->m_v4Engine); - QV4::ScopedValue v(scope, QV8Engine::metaTypeToJS(scope.engine, type, ptr)); + QV4::ScopedValue v(scope, QV4::ExecutionEngine::metaTypeToJS(scope.engine, type, ptr)); return new QJSValuePrivate(d->m_v4Engine, v); } @@ -424,7 +424,7 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *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); + return QV4::ExecutionEngine::metaTypeFromJS(scope.engine, v, type, ptr); } else if (vp->value.isEmpty()) { if (vp->unboundData.userType() == QMetaType::QString) { QString string = vp->unboundData.toString(); -- cgit v1.2.3