Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Change-Id: I5e0eef69a31bcfda65cf965fb4c8c330581e5168

3 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index 506ecb64bb..b50490e831 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -216,7 +216,8 @@ bool QV4DataCollector::collectScope(QJsonObject *dict, int frameNr, int scopeNr)
         return false;
 
     QV4::ScopedObject scopeObject(scope, engine()->newObject());
-    if (ctxt->d()->type == QV4::Heap::ExecutionContext::Type_CallContext) {
+    if (ctxt->d()->type == QV4::Heap::ExecutionContext::Type_CallContext ||
+            ctxt->d()->type == QV4::Heap::ExecutionContext::Type_BlockContext) {
         QStringList names;
         Refs collectedRefs;
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
index 71645579c5..499f060c9c 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
@@ -163,7 +163,7 @@ int QV4DebuggerAgent::addBreakPoint(const QString &fileName, int lineNumber, boo
         for (QV4Debugger *debugger : qAsConst(m_debuggers))
             debugger->addBreakPoint(fileName, lineNumber, condition);
 
-    int id = m_breakPoints.size();
+    const int id = ++m_lastBreakPointId;
     m_breakPoints.insert(id, BreakPoint(fileName, lineNumber, enabled, condition));
     return id;
 }
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h
index 39ac4d4dcb..43baec32d7 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h
@@ -93,6 +93,7 @@ private:
     };
 
     QHash<int, BreakPoint> m_breakPoints;
+    int m_lastBreakPointId = 0;
     bool m_breakOnThrow;
     QV4DebugServiceImpl *m_debugService;
 };