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/qqmlvme.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/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 192fc6fd12..1fc9a7eee0 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -64,6 +64,7 @@ #include "qqmlpropertyvalueinterceptor_p.h" #include "qqmlvaluetypeproxybinding_p.h" #include "qqmlexpression_p.h" +#include "qqmlcontextwrapper_p.h" #include <QStack> #include <QPointF> @@ -1153,8 +1154,8 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s if (!script->m_program) return QV4::PersistentValue(); - QV4::Value qmlglobal = v8engine->qmlScope(ctxt, 0); - v8engine->contextWrapper()->takeContextOwnership(qmlglobal); + QV4::Value qmlglobal = QV4::QmlContextWrapper::qmlScope(v8engine, ctxt, 0); + QV4::QmlContextWrapper::takeContextOwnership(qmlglobal); QV4::ExecutionContext *ctx = QV8Engine::getV4(v8engine)->current; try { |