From d47fdb934db48c8f6c6f933509b52ee521235b2c Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Dec 2017 10:12:17 +0100 Subject: Debugger: Change semantics of DebuggerEngine::masterEngine() Make it return 'this' if 'this' is the master engine itself. Adapt users. Also do not let the QmlEngine try to beginConnection() when the combined engine was isDying() already. Change-Id: I308deae14a3c4966be381f321c0d9dfaf82c40d6 Reviewed-by: Ulf Hermann --- src/plugins/debugger/qml/qmlengine.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/plugins/debugger/qml/qmlengine.cpp') diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 9fefece817..96007d1bcb 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -348,12 +348,9 @@ void QmlEngine::tryToConnect() showMessage("QML Debugger: Trying to connect ...", LogStatus); d->retryOnConnectFail = true; if (state() == EngineRunRequested) { - if (isSlaveEngine()) { + if (isDying()) { // Probably cpp is being debugged and hence we did not get the output yet. - if (!masterEngine()->isDying()) - beginConnection(); - else - appStartupFailed(tr("No application output received in time")); + appStartupFailed(tr("No application output received in time")); } else { beginConnection(); } @@ -779,7 +776,7 @@ void QmlEngine::attemptBreakpointSynchronization() BreakHandler *handler = breakHandler(); - DebuggerEngine *bpOwner = isSlaveEngine() ? masterEngine() : this; + DebuggerEngine *bpOwner = masterEngine(); foreach (Breakpoint bp, handler->unclaimedBreakpoints()) { // Take ownership of the breakpoint. Requests insertion. if (acceptsBreakpoint(bp)) -- cgit v1.2.1