Merge remote-tracking branch 'origin/9.0'

Change-Id: Idd9c2b1bf787040b7b415b7cda29035227ca1011
This commit is contained in:
Eike Ziller
2022-11-21 08:57:14 +01:00
9 changed files with 491 additions and 428 deletions

View File

@@ -1832,11 +1832,13 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
QList<Breakpoint> v8Breakpoints;
const QVariantList v8BreakpointIdList = breakData.value("breakpoints").toList();
// skip debug break if no breakpoint and we have not done a single step as last
// action - likely stopped in another file with same naming
if (v8BreakpointIdList.isEmpty() && previousStepAction == Continue) {
inferiorStop = false;
continueDebugging(Continue);
if (engine->state() != InferiorStopRequested) {
// skip debug break if no breakpoint and we have not done a single step as
// last action - likely stopped in another file with same naming
if (v8BreakpointIdList.isEmpty() && previousStepAction == Continue) {
inferiorStop = false;
continueDebugging(Continue);
}
}
for (const QVariant &breakpointId : v8BreakpointIdList) {