From 7544e753600b3da6431eeb4448da85ff98b6097e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 8 Sep 2010 10:09:28 +0200
Subject: [PATCH] Maemo: Fix remote debugging via gdbserver.
Also document remote gdbserver adapter's signal.
---
src/plugins/debugger/gdb/remotegdbserveradapter.h | 8 ++++++++
.../qt4projectmanager/qt-maemo/maemodebugsupport.cpp | 1 +
2 files changed, 9 insertions(+)
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.h b/src/plugins/debugger/gdb/remotegdbserveradapter.h
index 7eb89200c79..0f514e4ac33 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.h
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.h
@@ -65,6 +65,14 @@ private:
AbstractGdbProcess *gdbProc() { return &m_gdbProc; }
signals:
+ /*
+ * For "external" clients of a debugger run control that need to do
+ * further setup before the debugger is started (e.g. Maemo).
+ * Afterwards, handleSetupDone() or handleSetupFailed() must be called
+ * to continue or abort debugging, respectively.
+ * This signal is only emitted if the start parameters indicate that
+ * a server start script should be used, but none is given.
+ */
void requestSetup();
private:
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index 31c852bc1d4..72c6081046e 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -84,6 +84,7 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC
params.debuggerCommand = runConfig->gdbCmd();
params.remoteChannel = devConf.server.host + QLatin1Char(':')
+ QString::number(gdbServerPort(runConfig));
+ params.useServerStartScript = true;
params.remoteArchitecture = QLatin1String("arm");
}
params.processArgs = runConfig->arguments();
--
GitLab