diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 13:17:57 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 13:31:11 +0200 |
commit | 3fe97384fef6fd7d167017cd950313b34a64c9c1 (patch) | |
tree | 6213d12c923924e6f3442c9deee1850f25146d36 /src/qml/qml/qqmlbinding.cpp | |
parent | 78fc64d11c187a796e6b80bd1f35792e202fa9f9 (diff) |
Make the default constructor of PersistentValue not allocate a d pointer
This is also required to change the v8::Persistent in QQmlData over
to v4.
Change-Id: Ib3164ded9c772e977f6b43ef6163a3aa74da3800
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
-rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 9e1a1522af..b66f053b0f 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -279,7 +279,7 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags) bool isUndefined = false; v8::Handle<v8::Value> result = - QQmlJavaScriptExpression::evaluate(context(), **v4function, &isUndefined); + QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined); trace.event("writing binding result"); @@ -320,7 +320,7 @@ QVariant QQmlBinding::evaluate() bool isUndefined = false; v8::Handle<v8::Value> result = - QQmlJavaScriptExpression::evaluate(context(), **v4function, &isUndefined); + QQmlJavaScriptExpression::evaluate(context(), v4function.value(), &isUndefined); ep->dereferenceScarceResources(); |