From 02f85a9949e2a30ddef8c99b4d39b3ab515fe838 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 14 Jul 2010 11:32:25 +0200
Subject: [PATCH] debugger: adjust maemo adapter to new architecture
---
src/plugins/debugger/debuggerengine.cpp | 3 +--
src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 515cbb52ab5..46f857926b7 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1293,8 +1293,7 @@ void DebuggerEngine::notifyInferiorExited()
}
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
- showMessage(_("QUEUE: SHUTDOWN ENGINE"));
- QTimer::singleShot(0, d, SLOT(doShutdownEngine()));
+ d->queueShutdownEngine();
}
void DebuggerEngine::setState(DebuggerState state, bool forced)
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 598bbde92e1..e4f83f1523a 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -171,7 +171,6 @@ void RemoteGdbServerAdapter::setupInferior()
}
m_engine->postCommand("set target-async on", CB(handleSetTargetAsync));
- QString x = startParameters().executable;
QFileInfo fi(startParameters().executable);
QString fileName = fi.absoluteFilePath();
m_engine->postCommand("-file-exec-and-symbols \""
@@ -210,7 +209,6 @@ void RemoteGdbServerAdapter::handleTargetRemote(const GdbResponse &record)
{
QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
if (record.resultClass == GdbResultDone) {
- m_engine->notifyInferiorStopOk();
// gdb server will stop the remote application itself.
showMessage(_("INFERIOR STARTED"));
showMessage(msgAttachedToStoppedInferior(), StatusBar);
@@ -225,6 +223,8 @@ void RemoteGdbServerAdapter::handleTargetRemote(const GdbResponse &record)
void RemoteGdbServerAdapter::runEngine()
{
+ m_engine->notifyEngineRunAndInferiorStopOk();
+ m_engine->notifyInferiorRunRequested();
m_engine->continueInferiorInternal();
}
--
GitLab