From 39f1e0d66dc434e764731fbfed29c8fd98d217aa Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 13 Jan 2015 09:01:29 +0100 Subject: Make sure we always have an engine when assigning to a Persistent This prepares things for a rewrite of the internals of Persistent. Change-Id: Ib93ec5911984d1bfce87ffdc3f86bc75f6ecafe9 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmljavascriptexpression.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/qqmljavascriptexpression.cpp') diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 1745a338f3..5f8190b8dc 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -308,7 +308,7 @@ QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scopeObje return QV4::Encode::undefined(); } if (qmlscope) - *qmlscope = qmlScopeObject; + qmlscope->set(v4, qmlScopeObject); return result.asReturnedValue(); } @@ -341,7 +341,7 @@ QV4::ReturnedValue QQmlJavaScriptExpression::qmlBinding(QQmlContextData *ctxt, Q return QV4::Encode::undefined(); } if (qmlscope) - *qmlscope = qmlScopeObject; + qmlscope->set(v4, qmlScopeObject); return result.asReturnedValue(); } -- cgit v1.2.3