From 74807c0725ad6ef6ccd49611bb9f4f994cddf106 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 24 Sep 2013 15:25:10 +0200 Subject: Move more API over to use ValueRef Change-Id: I372f1f3e3e78d45912a913f437e622e0acfc9646 Reviewed-by: Simon Hausmann --- src/qml/jsapi/qjsengine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/qml/jsapi/qjsengine.cpp') diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 59a6a14e81..57647a49d3 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -375,7 +375,9 @@ 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) { - return engine->metaTypeFromJS(QV4::Value::fromReturnedValue(vp->getValue(engine->m_v4Engine)), type, ptr); + QV4::Scope scope(engine->m_v4Engine); + QV4::ScopedValue v(scope, vp->getValue(engine->m_v4Engine)); + return engine->metaTypeFromJS(v, type, ptr); } else { switch (type) { case QMetaType::Bool: -- cgit v1.2.3