From 02b6e3cb77393b2f8b85da60c55725bd309724f5 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 29 Nov 2010 16:53:40 +0100
Subject: [PATCH] debugger: forward-port
49cac3d4484faf9308260d77cb1562c3a756b41e
Mis-merge?
---
src/plugins/debugger/debuggerengine.cpp | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 5a2e147f07a..6dc9c22c83c 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -728,7 +728,7 @@ void DebuggerEngine::notifyEngineRunFailed()
d->m_progress.reportCanceled();
d->m_progress.reportFinished();
setState(EngineRunFailed);
- d->queueShutdownInferior();
+ d->queueShutdownEngine();
}
void DebuggerEngine::notifyEngineRunAndInferiorRunOk()
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 73eb4319fe9..fd9f10ef9b1 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -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 + +
--
GitLab