diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 559382ce73d09a4bbfe2dc44fc6d94b1e455654b..81ad455a00c65a89fdf4a9cadaf1f1b289098f72 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -230,7 +230,6 @@ public: } void doSetupEngine(); - void doSetupInferior(); void doRunEngine(); void doShutdownEngine(); void doShutdownInferior(); @@ -691,24 +690,13 @@ void DebuggerEngine::notifyEngineSetupOk() showMessage("NOTE: ENGINE SETUP OK"); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << this << state()); setState(EngineSetupOk); - if (isMasterEngine() && runTool()) { + if (isMasterEngine() && runTool()) runTool()->reportStarted(); - d->doSetupInferior(); - } -} -void DebuggerEngine::setupSlaveInferior() -{ - QTC_CHECK(state() == EngineSetupOk); - d->doSetupInferior(); -} - -void DebuggerEnginePrivate::doSetupInferior() -{ - m_engine->setState(InferiorSetupRequested); - m_engine->showMessage("CALL: SETUP INFERIOR"); - m_progress.setProgressValue(250); - m_engine->setupInferior(); + setState(InferiorSetupRequested); + showMessage("CALL: SETUP INFERIOR"); + d->m_progress.setProgressValue(250); + setupInferior(); } void DebuggerEngine::notifyInferiorSetupFailed() diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index e7f267692b8e558eb475a0d433b8fa2de7cace99..9def5109f7447189c285da336ab9dca95b0aa397 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -470,7 +470,6 @@ protected: bool isStateDebugging() const; void setStateDebugging(bool on); - virtual void setupSlaveInferior(); virtual void setupSlaveEngine(); virtual void runSlaveEngine(); virtual void shutdownSlaveEngine(); diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 77e5204dc9afdcf9699ba54cca0814f0f611230a..21e280ebfe470d7386b850524363570c46dea611 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -380,8 +380,8 @@ void QmlCppEngine::setupEngine() void QmlCppEngine::setupInferior() { EDEBUG("\nMASTER SETUP INFERIOR"); - m_qmlEngine->setupSlaveInferior(); - m_cppEngine->setupSlaveInferior(); + m_qmlEngine->setupInferior(); + m_cppEngine->setupInferior(); } void QmlCppEngine::runEngine()