diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-24 13:26:38 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-24 13:58:56 +0200 |
| commit | 0de6e8bb1bf0ca6e4d7992be15ed31f87514e48a (patch) | |
| tree | 29e0e58b32607a5edb6c309dd53645d5af4b8ee9 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 74632fa02a5bd8653c02a4d84a1bcb6b1d5a88f5 (diff) | |
Get rid of Get/SetHiddenValue in the v8 API
It was only used to mark an object as something to be used as a binding.
Simply use one of the free bits in QV4::Managed for that.
Also changed a bit more code over from v8 to v4.
Change-Id: I6e787e611041e058fe109df1d7a13598655f8eba
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 0e733cb1d2..28abf5fa11 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -326,7 +326,7 @@ QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scope, QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine()); QV4::ExecutionContext *ctx = v4->current; - QV4::Value scopeObject = ep->v8engine()->qmlScope(ctxt, scope)->v4Value(); + QV4::Value scopeObject = ep->v8engine()->qmlScope(ctxt, scope); QV4::Script script(v4, scopeObject.asObject(), code, filename, line); QV4::Value result; try { @@ -360,7 +360,7 @@ QV4::PersistentValue QQmlJavaScriptExpression::qmlBinding(QQmlContextData *ctxt, QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine()); QV4::ExecutionContext *ctx = v4->current; - QV4::Value scopeObject = ep->v8engine()->qmlScope(ctxt, scope)->v4Value(); + QV4::Value scopeObject = ep->v8engine()->qmlScope(ctxt, scope); QV4::Script script(v4, scopeObject.asObject(), code, filename, line); QV4::Value result; try { |