feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Merge {Abstract,Local}GdbProcess to GdbProcess

Browse Source 
Change-Id: I46e8b4347205791eeb6ebd3ebbde9a993d892e93
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-09-09 16:42:32 +02:00
parent c260d7cdde
commit 994075dde1
16 changed files with 70 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -29,6 +29,8 @@
#include "remotegdbserveradapter.h"
#include "gdbprocess.h"
#include <debugger/debuggeractions.h>
#include <debugger/debuggercore.h>
#include <debugger/debuggerprotocol.h>
@@ -99,9 +101,9 @@ void GdbRemoteServerEngine::setupEngine()
m_uploadProc.waitForStarted();
}
if (!startParameters().workingDirectory.isEmpty())
m_gdbProc.setWorkingDirectory(startParameters().workingDirectory);
m_gdbProc->setWorkingDirectory(startParameters().workingDirectory);
if (startParameters().environment.size())
m_gdbProc.setEnvironment(startParameters().environment.toStringList());
m_gdbProc->setEnvironment(startParameters().environment.toStringList());
if (startParameters().remoteSetupNeeded)
notifyEngineRequestRemoteSetup();
@@ -435,10 +437,10 @@ void GdbRemoteServerEngine::interruptInferior2()
CB(handleInterruptInferior));
#ifdef Q_OS_WIN
} else if (m_isQnxGdb) {
m_gdbProc.winInterruptByCtrlC();
m_gdbProc->winInterruptByCtrlC();
#endif
} else {
bool ok = m_gdbProc.interrupt();
bool ok = m_gdbProc->interrupt();
if (!ok) {
// FIXME: Extra state needed?
showMessage(_("NOTE: INFERIOR STOP NOT POSSIBLE"));