aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-20 11:00:06 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-21 09:57:06 +0200
commit75462746ab3afd892e7deca28c88ddf68da0a9c0 (patch)
tree7d1115812fb27ffddcb43e549aab79c64beb62fc
parentee383110d574ab0bf13fac8a32cc6fa982612040 (diff)
Comment out two lines that cause assertions
The subcontext code is only used to add debugging info through the V8 API. Change-Id: Ibcb3284180aca1568b44d9d387d96bfae715283d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/qml/qml/v8/qv8include.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8include.cpp b/src/qml/qml/v8/qv8include.cpp
index 9794d85eff..f3880ec9a2 100644
--- a/src/qml/qml/v8/qv8include.cpp
+++ b/src/qml/qml/v8/qv8include.cpp
@@ -142,7 +142,8 @@ void QV8Include::finished()
v8::Handle<v8::Script> script = m_engine->qmlModeCompile(code, m_url.toString());
if (!try_catch.HasCaught()) {
- m_engine->contextWrapper()->addSubContext(m_qmlglobal.value(), script, importContext);
+ // ### Only used for debugging info
+ //m_engine->contextWrapper()->addSubContext(m_qmlglobal.value(), script, importContext);
script->Run(m_qmlglobal.value());
}
@@ -214,7 +215,8 @@ QV4::Value QV8Include::include(const v8::Arguments &args)
if (!try_catch.HasCaught()) {
v8::Handle<v8::Object> qmlglobal = QV4::Value::fromObject(args.GetIsolate()->GetEngine()->qmlContextObject());
- engine->contextWrapper()->addSubContext(qmlglobal, script, importContext);
+ // ### Only used for debugging info
+ // engine->contextWrapper()->addSubContext(qmlglobal, script, importContext);
script->Run(qmlglobal);
}