Skip to content

GitLab

F
flatpak-qt-creator
Commit 02b6e3cb authored by hjk's avatar hjk
Browse files
Options

debugger: forward-port 49cac3d4 

Mis-merge?
parent dcd1876d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/plugins/debugger/debuggerengine.cpp
View file @ 02b6e3cb
......@@ -728,7 +728,7 @@ void DebuggerEngine::notifyEngineRunFailed()
d->m_progress.reportCanceled();
d->m_progress.reportFinished();
setState(EngineRunFailed);
d->queueShutdownInferior();
d->queueShutdownEngine();
}
void DebuggerEngine::notifyEngineRunAndInferiorRunOk()
......
src/plugins/debugger/debuggerplugin.cpp
View file @ 02b6e3cb
......@@ -188,7 +188,7 @@
// | (core) | (attach) | | +
// | | | | +
// {notify- {notifyER&- {notifyER&- {notify- +
// Inferior- Inferior- Inferior- RunEngine- +
// Inferior- Inferior- Inferior- EngineRun- +
// Unrunnable} StopOk} RunOk} Failed} +
// + + + + +
// InferiorUnrunnable + InferiorRunOk + +
......@@ -198,7 +198,7 @@
// `-+-+-+-+-+-+-+-+-+-+-+>-+
// +
// +
// #Interrupt@InferiorRunOk# +
// #Interrupt@InferiorRunOk# +
// + +
// InferiorStopRequested +
// #SpontaneousStop + +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment