1 files changed, 28 insertions, 16 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index d5cc765ea8..df316c1ae6 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -43,6 +43,7 @@
 #include <private/qqmlcontext_p.h>
 #include <private/qv4qmlcontext_p.h>
 #include <private/qv4qobjectwrapper_p.h>
+#include <private/qqmldebugservice_p.h>
 
 #include <QtQml/qqmlengine.h>
 
@@ -52,9 +53,10 @@ QV4DebugJob::~QV4DebugJob()
 {
 }
 
-JavaScriptJob::JavaScriptJob(QV4::ExecutionEngine *engine, int frameNr,
-                                   const QString &script) :
-    engine(engine), frameNr(frameNr), script(script), resultIsException(false)
+JavaScriptJob::JavaScriptJob(QV4::ExecutionEngine *engine, int frameNr, int context,
+                             const QString &script) :
+    engine(engine), frameNr(frameNr), context(context), script(script),
+    resultIsException(false)
 {}
 
 void JavaScriptJob::run()
@@ -65,7 +67,23 @@ void JavaScriptJob::run()
 
     QV4::ExecutionContext *ctx = engine->currentContext;
     QObject scopeObject;
-    if (frameNr < 0) { // Use QML context if available
+
+    if (frameNr > 0) {
+        for (int i = 0; i < frameNr; ++i) {
+            ctx = engine->parentContext(ctx);
+        }
+        engine->pushContext(ctx);
+        ctx = engine->currentContext;
+    }
+
+    if (context >= 0) {
+        QQmlContext *extraContext = qmlContext(QQmlDebugService::objectForId(context));
+        if (extraContext) {
+            engine->pushContext(QV4::QmlContext::create(ctx, QQmlContextData::get(extraContext),
+                                                        &scopeObject));
+            ctx = engine->currentContext;
+        }
+    } else if (frameNr < 0) { // Use QML context if available
         QQmlEngine *qmlEngine = engine->qmlEngine();
         if (qmlEngine) {
             QQmlContext *qmlRootContext = qmlEngine->rootContext();
@@ -89,13 +107,6 @@ void JavaScriptJob::run()
             engine->pushContext(ctx->newWithContext(withContext->toObject(engine)));
             ctx = engine->currentContext;
         }
-    } else {
-        if (frameNr > 0) {
-            for (int i = 0; i < frameNr; ++i) {
-                ctx = engine->parentContext(ctx);
-            }
-            engine->pushContext(ctx);
-        }
     }
 
     QV4::Script script(ctx, this->script);
@@ -206,7 +217,7 @@ void ValueLookupJob::run()
                                 QQmlContextData::get(engine->qmlEngine()->rootContext()),
                                 scopeObject.data()));
     }
-    foreach (const QJsonValue &handle, handles) {
+    for (const QJsonValue &handle : handles) {
         QV4DataCollector::Ref ref = handle.toInt();
         if (!collector->isValidRef(ref)) {
             exception = QString::fromLatin1("Invalid Ref: %1").arg(ref);
@@ -225,8 +236,9 @@ const QString &ValueLookupJob::exceptionMessage() const
 }
 
 ExpressionEvalJob::ExpressionEvalJob(QV4::ExecutionEngine *engine, int frameNr,
-                                     const QString &expression, QV4DataCollector *collector) :
-    JavaScriptJob(engine, frameNr, expression), collector(collector)
+                                     int context, const QString &expression,
+                                     QV4DataCollector *collector) :
+    JavaScriptJob(engine, frameNr, context, expression), collector(collector)
 {
 }
 
@@ -259,7 +271,7 @@ GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine)
 
 void GatherSourcesJob::run()
 {
-    foreach (QV4::CompiledData::CompilationUnit *unit, engine->compilationUnits) {
+    for (QV4::CompiledData::CompilationUnit *unit : qAsConst(engine->compilationUnits)) {
         QString fileName = unit->fileName();
         if (!fileName.isEmpty())
             sources.append(fileName);
@@ -272,7 +284,7 @@ const QStringList &GatherSourcesJob::result() const
 }
 
 EvalJob::EvalJob(QV4::ExecutionEngine *engine, const QString &script) :
-    JavaScriptJob(engine, /*frameNr*/-1, script), result(false)
+    JavaScriptJob(engine, /*frameNr*/-1, /*context*/ -1, script), result(false)
 {}
 
 void EvalJob::handleResult(QV4::ScopedValue &result)