1 files changed, 21 insertions, 17 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index 00c5c1ad77..1d2cc092dc 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -152,7 +152,7 @@ class UnknownV8CommandHandler: public V8CommandHandler
 public:
     UnknownV8CommandHandler(): V8CommandHandler(QString()) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         QString msg = QLatin1String("unimplemented command \"")
                 + req.value(QLatin1String("command")).toString()
@@ -167,7 +167,7 @@ class V8VersionRequest: public V8CommandHandler
 public:
     V8VersionRequest(): V8CommandHandler(QStringLiteral("version")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         addCommand();
         addRequestSequence();
@@ -177,6 +177,7 @@ public:
         body.insert(QStringLiteral("V8Version"),
                     QLatin1String("this is not V8, this is V4 in Qt " QT_VERSION_STR));
         body.insert(QStringLiteral("UnpausedEvaluate"), true);
+        body.insert(QStringLiteral("ContextEvaluate"), true);
         addBody(body);
     }
 };
@@ -186,7 +187,7 @@ class V8SetBreakPointRequest: public V8CommandHandler
 public:
     V8SetBreakPointRequest(): V8CommandHandler(QStringLiteral("setbreakpoint")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject args = req.value(QLatin1String("arguments")).toObject();
@@ -237,7 +238,7 @@ class V8ClearBreakPointRequest: public V8CommandHandler
 public:
     V8ClearBreakPointRequest(): V8CommandHandler(QStringLiteral("clearbreakpoint")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject args = req.value(QLatin1String("arguments")).toObject();
@@ -270,7 +271,7 @@ class V8BacktraceRequest: public V8CommandHandler
 public:
     V8BacktraceRequest(): V8CommandHandler(QStringLiteral("backtrace")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
 
@@ -303,7 +304,7 @@ class V8FrameRequest: public V8CommandHandler
 public:
     V8FrameRequest(): V8CommandHandler(QStringLiteral("frame")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
@@ -345,7 +346,7 @@ class V8ScopeRequest: public V8CommandHandler
 public:
     V8ScopeRequest(): V8CommandHandler(QStringLiteral("scope")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
@@ -390,7 +391,7 @@ class V8LookupRequest: public V8CommandHandler
 public:
     V8LookupRequest(): V8CommandHandler(QStringLiteral("lookup")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
@@ -430,7 +431,7 @@ class V8ContinueRequest: public V8CommandHandler
 public:
     V8ContinueRequest(): V8CommandHandler(QStringLiteral("continue")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         // decypher the payload:
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
@@ -476,7 +477,7 @@ class V8DisconnectRequest: public V8CommandHandler
 public:
     V8DisconnectRequest(): V8CommandHandler(QStringLiteral("disconnect")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         debugService->debuggerAgent.removeAllBreakPoints();
         debugService->debuggerAgent.resumeAll();
@@ -494,7 +495,7 @@ class V8SetExceptionBreakRequest: public V8CommandHandler
 public:
     V8SetExceptionBreakRequest(): V8CommandHandler(QStringLiteral("setexceptionbreak")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         bool wasEnabled = debugService->debuggerAgent.breakOnThrow();
 
@@ -534,7 +535,7 @@ class V8ScriptsRequest: public V8CommandHandler
 public:
     V8ScriptsRequest(): V8CommandHandler(QStringLiteral("scripts")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         //decypher the payload:
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
@@ -558,7 +559,7 @@ public:
         debugger->runInEngine(&job);
 
         QJsonArray body;
-        foreach (const QString &source, job.result()) {
+        for (const QString &source : job.result()) {
             QJsonObject src;
             src[QLatin1String("name")] = source;
             src[QLatin1String("scriptType")] = 4;
@@ -606,10 +607,11 @@ class V8EvaluateRequest: public V8CommandHandler
 public:
     V8EvaluateRequest(): V8CommandHandler(QStringLiteral("evaluate")) {}
 
-    virtual void handleRequest()
+    void handleRequest() override
     {
         QJsonObject arguments = req.value(QLatin1String("arguments")).toObject();
         QString expression = arguments.value(QLatin1String("expression")).toString();
+        int context = arguments.value(QLatin1String("context")).toInt(-1);
         int frame = -1;
 
         QV4Debugger *debugger = debugService->debuggerAgent.pausedDebugger();
@@ -627,7 +629,8 @@ public:
             frame = arguments.value(QLatin1String("frame")).toInt(0);
         }
 
-        ExpressionEvalJob job(debugger->engine(), frame, expression, debugger->collector());
+        ExpressionEvalJob job(debugger->engine(), frame, context, expression,
+                              debugger->collector());
         debugger->runInEngine(&job);
         if (job.hasExeption()) {
             createErrorResponse(job.exceptionMessage());
@@ -718,7 +721,8 @@ void QV4DebugServiceImpl::stateAboutToBeChanged(State state)
 {
     QMutexLocker lock(&m_configMutex);
     if (state == Enabled) {
-        foreach (QV4Debugger *debugger, debuggerAgent.debuggers()) {
+        const auto debuggers = debuggerAgent.debuggers();
+        for (QV4Debugger *debugger : debuggers) {
             QV4::ExecutionEngine *ee = debugger->engine();
             if (!ee->debugger())
                 ee->setDebugger(debugger);
@@ -737,7 +741,7 @@ void QV4DebugServiceImpl::signalEmitted(const QString &signal)
     //Normalize to Lower case.
     QString signalName = signal.left(signal.indexOf(QLatin1Char('('))).toLower();
 
-    foreach (const QString &signal, breakOnSignals) {
+    for (const QString &signal : qAsConst(breakOnSignals)) {
         if (signal == signalName) {
             // TODO: pause debugger
             break;