diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-30 13:45:23 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-30 16:42:25 +0200 |
| commit | ca7ddc345ec4df017b7db6aee5a823f817e6e708 (patch) | |
| tree | 170cd6efba1028f867e15cb2dce160f3639d2395 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 35ab04c907a1cefa23eff2d7c853350fb5d27178 (diff) | |
Cleanup the context wrapper code
Remove the QV8ContextWrapper class and move the code out
of the v8 directory.
Change-Id: I00c02f7310a3e43bd105c5bc5af034ce652cfd49
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 81d5f237b5..1d4bba66d2 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -42,6 +42,7 @@ #include "qqmljavascriptexpression_p.h" #include <private/qqmlexpression_p.h> +#include <private/qqmlcontextwrapper_p.h> #include <private/qv4value_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4script_p.h> @@ -311,7 +312,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); + QV4::Value scopeObject = QV4::QmlContextWrapper::qmlScope(ep->v8engine(), ctxt, scope); QV4::Script script(v4, scopeObject.asObject(), code, filename, line); QV4::Value result; try { @@ -345,7 +346,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); + QV4::Value scopeObject = QV4::QmlContextWrapper::qmlScope(ep->v8engine(), ctxt, scope); QV4::Script script(v4, scopeObject.asObject(), code, filename, line); QV4::Value result; try { |