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

Merge commit 'origin/1.3'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
This commit is contained in:
con
2009-11-03 18:08:01 +01:00
parent e77e8e9a28 2c115e934f
commit fa34847571
50 changed files with 22332 additions and 1893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/gdb/remotegdbadapter.h
View File

@@ -46,9 +46,9 @@ class RemoteGdbAdapter : public AbstractGdbAdapter
Q_OBJECT
public:
RemoteGdbAdapter(GdbEngine *engine, QObject *parent = 0);
RemoteGdbAdapter(GdbEngine *engine, int toolChainType, QObject *parent = 0);
bool dumpersAvailable() const { return true; }
virtual DumperHandling dumperHandling() const;
void startAdapter();
void startInferior();
@@ -65,6 +65,8 @@ private:
void handleFileExecAndSymbols(const GdbResponse &response);
void handleTargetRemote(const GdbResponse &response);
const int m_toolChainType;
QProcess m_uploadProc;
};