aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8include.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-03 16:51:32 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-04 09:57:28 +0200
commit6471a2586de63e09ddec4b3b3dba1c6eee34c58d (patch)
tree96719d690d0d84509302d95b44516d1376cea4d9 /src/qml/qml/v8/qv8include.cpp
parentb24103703c4056d6d299d5625c92f2453eff228e (diff)
Remove another methods from v8:Context
Change-Id: I1f476931e7d09efc72e64dcb1b86335c987678ea Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8include.cpp')
-rw-r--r--src/qml/qml/v8/qv8include.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8include.cpp b/src/qml/qml/v8/qv8include.cpp
index 0d76050298..fc59093a0f 100644
--- a/src/qml/qml/v8/qv8include.cpp
+++ b/src/qml/qml/v8/qv8include.cpp
@@ -48,6 +48,7 @@
#include <QtQml/qqmlfile.h>
#include <private/qqmlengine_p.h>
+#include <private/qv4engine_p.h>
QT_BEGIN_NAMESPACE
@@ -190,7 +191,7 @@ v8::Handle<v8::Value> QV8Include::include(const v8::Arguments &args)
if (localFile.isEmpty()) {
QV8Include *i = new QV8Include(url, engine, context,
- v8::Context::GetCallingQmlGlobal(),
+ QV4::Value::fromObject(args.GetIsolate()->GetEngine()->qmlContextObject()),
callbackFunction);
result = v8::Local<v8::Object>::New(i->result());
@@ -214,7 +215,7 @@ v8::Handle<v8::Value> QV8Include::include(const v8::Arguments &args)
v8::Local<v8::Script> script = engine->qmlModeCompile(code, url.toString());
if (!try_catch.HasCaught()) {
- v8::Local<v8::Object> qmlglobal = v8::Context::GetCallingQmlGlobal();
+ v8::Handle<v8::Object> qmlglobal = QV4::Value::fromObject(args.GetIsolate()->GetEngine()->qmlContextObject());
engine->contextWrapper()->addSubContext(qmlglobal, script, importContext);
script->Run(qmlglobal);
}