diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index f5954d0e638..896e69e6d2e 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -812,7 +812,7 @@ void CdbEngine::runEngine() } if (startParameters().startMode == AttachCore) { QTC_ASSERT(!m_coreStopReason.isNull(), return; ); - notifyInferiorUnrunnable(); + notifyEngineRunOkAndInferiorUnrunnable(); processStop(*m_coreStopReason, false); } else { doContinueInferior(); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 5c67aecaf04..c69e4e12f66 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -825,7 +825,7 @@ void DebuggerEnginePrivate::doRunEngine() m_engine->runEngine(); } -void DebuggerEngine::notifyInferiorUnrunnable() +void DebuggerEngine::notifyEngineRunOkAndInferiorUnrunnable() { showMessage(_("NOTE: INFERIOR UNRUNNABLE")); d->m_progress.setProgressValue(1000); @@ -904,16 +904,6 @@ void DebuggerEngine::notifyEngineRemoteSetupFinished(const RemoteSetupResult &re } } -void DebuggerEngine::notifyEngineRunOkAndInferiorRunRequested() -{ - showMessage(_("NOTE: ENGINE RUN OK AND INFERIOR RUN REQUESTED")); - d->m_progress.setProgressValue(1000); - d->m_progress.reportFinished(); - QTC_ASSERT(state() == EngineRunRequested, qDebug() << this << state()); - showStatusMessage(tr("Running.")); - setState(InferiorRunRequested); -} - void DebuggerEngine::notifyEngineRunAndInferiorRunOk() { showMessage(_("NOTE: ENGINE RUN AND INFERIOR RUN OK")); diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 5a1444caaca..5a9840acb35 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -293,10 +293,9 @@ protected: virtual void notifyInferiorSetupOk(); virtual void notifyInferiorSetupFailed(); - virtual void notifyEngineRunOkAndInferiorRunRequested(); virtual void notifyEngineRunAndInferiorRunOk(); virtual void notifyEngineRunAndInferiorStopOk(); - virtual void notifyInferiorUnrunnable(); // Called by CoreAdapter. + virtual void notifyEngineRunOkAndInferiorUnrunnable(); // Called by CoreAdapter. // Use notifyInferiorRunRequested() plus notifyInferiorRunOk() instead. //virtual void notifyInferiorSpontaneousRun(); diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index 4c1027a5872..1ee58825fff 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -243,7 +243,7 @@ void GdbCoreEngine::runEngine() void GdbCoreEngine::handleTargetCore(const DebuggerResponse &response) { QTC_ASSERT(state() == EngineRunRequested, qDebug() << state()); - notifyInferiorUnrunnable(); + notifyEngineRunOkAndInferiorUnrunnable(); if (response.resultClass == ResultDone) { showMessage(tr("Attached to core."), StatusBar); // Due to the auto-solib-add off setting, we don't have any diff --git a/src/plugins/debugger/gdb/gdbplainengine.cpp b/src/plugins/debugger/gdb/gdbplainengine.cpp index c19bdde3a82..52b53af71e3 100644 --- a/src/plugins/debugger/gdb/gdbplainengine.cpp +++ b/src/plugins/debugger/gdb/gdbplainengine.cpp @@ -93,7 +93,6 @@ void GdbPlainEngine::handleExecRun(const DebuggerResponse &response) { QTC_ASSERT(state() == EngineRunRequested, qDebug() << state()); if (response.resultClass == ResultRunning) { - //notifyEngineRunOkAndInferiorRunRequested(); notifyEngineRunAndInferiorRunOk(); // For gdb < 7.0 //showStatusMessage(tr("Running...")); showMessage(_("INFERIOR STARTED")); diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 0bc0e83a9f7..08bfb8cf0da 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -535,7 +535,7 @@ void QmlCppEngine::slaveEngineStateChanged } case InferiorUnrunnable: { qmlEngine()->quitDebugger(); - notifyInferiorUnrunnable(); + notifyEngineRunOkAndInferiorUnrunnable(); break; } case InferiorRunRequested: {