From 8f1a161c649d26cd256323d92a20270310738932 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Nov 2017 17:12:03 +0100 Subject: Debugger: Merge EngineSetup and InferiorSetup start phases It was needed in the past to trigger e.g. gdbserver setup in remote cases which is nowadays handled by separate RunWorkers. Change-Id: I30bce071dab0779cce2e7abef7b31550d8539461 Reviewed-by: Christian Stenger Reviewed-by: David Schulz --- src/plugins/debugger/qml/qmlengine.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 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 9f62e03252..69b34659f2 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -322,16 +322,6 @@ void QmlEngine::setState(DebuggerState state, bool forced) updateCurrentContext(); } -void QmlEngine::setupInferior() -{ - QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state()); - - notifyInferiorSetupOk(); - - if (d->automaticConnect) - beginConnection(); -} - void QmlEngine::handleLauncherStarted() { // FIXME: The QmlEngine never calls notifyInferiorPid() triggering the @@ -593,6 +583,9 @@ void QmlEngine::shutdownEngine() void QmlEngine::setupEngine() { notifyEngineSetupOk(); + + if (d->automaticConnect) + beginConnection(); } void QmlEngine::continueInferior() -- cgit v1.2.1