diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-12 22:37:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:55 +0200 |
| commit | a2d115fbaffee282a1d32ed92c6700e6c3dd811b (patch) | |
| tree | 7694e53751edd605d99d1d8eb19c9cd5d6d8188a /src/qml/qml/qqmlbinding.cpp | |
| parent | 399f88f6b75bb842be8e9d3671ace5114e115542 (diff) | |
Convert most remaining return values from Value to ReturnedValue
Change-Id: If8b0c3b91be50678693868c10fefc3678008834d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index eff17ddd9a..a5e281dc56 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -244,12 +244,13 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags) } else { QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context()->engine); + QV4::Scope scope(ep->v4engine()); + ep->referenceScarceResources(); bool isUndefined = false; - QV4::Value result = - QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined); + QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined)); trace.event("writing binding result"); @@ -285,12 +286,12 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags) QVariant QQmlBinding::evaluate() { QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context()->engine); + QV4::Scope scope(ep->v4engine()); ep->referenceScarceResources(); bool isUndefined = false; - QV4::Value result = - QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined); + QV4::ScopedValue result(scope, QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined)); ep->dereferenceScarceResources(); |