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

Maemo: Fix remote debugging.

Browse Source 
Was broken by 77e3bfe845.
This commit is contained in:
Christian Kandeler
2010-12-15 16:37:21 +01:00
parent c8f050715f
commit ee6bf38ea2
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ void RemoteGdbServerAdapter::uploadProcFinished()
&& m_uploadProc.exitCode() == 0) && m_uploadProc.exitCode() == 0)
handleSetupDone(); handleSetupDone();
else else
handleSetupFailed(m_uploadProc.errorString()); handleRemoteSetupFailed(m_uploadProc.errorString());
} }
void RemoteGdbServerAdapter::setupInferior() void RemoteGdbServerAdapter::setupInferior()
@@ -300,7 +300,7 @@ void RemoteGdbServerAdapter::shutdownAdapter()
m_engine->notifyAdapterShutdownOk(); m_engine->notifyAdapterShutdownOk();
} }
void RemoteGdbServerAdapter::handleSetupDone(int gdbServerPort, int qmlPort) void RemoteGdbServerAdapter::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
@@ -323,7 +323,7 @@ void RemoteGdbServerAdapter::handleSetupDone()
m_engine->handleAdapterStarted(); m_engine->handleAdapterStarted();
} }
void RemoteGdbServerAdapter::handleSetupFailed(const QString &reason) void RemoteGdbServerAdapter::handleRemoteSetupFailed(const QString &reason)
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());

5
src/plugins/debugger/gdb/remotegdbserveradapter.h
View File

@@ -48,8 +48,6 @@ class RemoteGdbServerAdapter : public AbstractGdbAdapter
public: public:
RemoteGdbServerAdapter(GdbEngine *engine, int toolChainType, QObject *parent = 0); RemoteGdbServerAdapter(GdbEngine *engine, int toolChainType, QObject *parent = 0);
void handleSetupDone(int gdbServerPort, int qmlPort);
void handleSetupFailed(const QString &reason);
private: private:
DumperHandling dumperHandling() const; DumperHandling dumperHandling() const;
@@ -82,6 +80,9 @@ private:
Q_SLOT void uploadProcError(QProcess::ProcessError error); Q_SLOT void uploadProcError(QProcess::ProcessError error);
Q_SLOT void uploadProcFinished(); Q_SLOT void uploadProcFinished();
virtual void handleRemoteSetupDone(int gdbServerPort, int qmlPort);
virtual void handleRemoteSetupFailed(const QString &reason);
void handleSetTargetAsync(const GdbResponse &response); void handleSetTargetAsync(const GdbResponse &response);
void handleFileExecAndSymbols(const GdbResponse &response); void handleFileExecAndSymbols(const GdbResponse &response);
void callTargetRemote(); void callTargetRemote();

4
src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
View File

@@ -100,7 +100,7 @@ void RemotePlainGdbAdapter::shutdownAdapter()
m_engine->notifyAdapterShutdownOk(); m_engine->notifyAdapterShutdownOk();
} }
void RemotePlainGdbAdapter::handleSetupDone(int gdbServerPort, int qmlPort) void RemotePlainGdbAdapter::handleRemoteSetupDone(int gdbServerPort, int qmlPort)
{ {
Q_UNUSED(gdbServerPort); Q_UNUSED(gdbServerPort);
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
@@ -128,7 +128,7 @@ void RemotePlainGdbAdapter::handleGdbStartFailed()
m_engine->handleAdapterStartFailed(m_gdbProc.errorString()); m_engine->handleAdapterStartFailed(m_gdbProc.errorString());
} }
void RemotePlainGdbAdapter::handleSetupFailed(const QString &reason) void RemotePlainGdbAdapter::handleRemoteSetupFailed(const QString &reason)
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());

4
src/plugins/debugger/gdb/remoteplaingdbadapter.h
View File

@@ -43,8 +43,6 @@ class RemotePlainGdbAdapter : public AbstractPlainGdbAdapter
public: public:
friend class RemoteGdbProcess; friend class RemoteGdbProcess;
explicit RemotePlainGdbAdapter(GdbEngine *engine, QObject *parent = 0); explicit RemotePlainGdbAdapter(GdbEngine *engine, QObject *parent = 0);
void handleSetupDone(int gdbServerPort, int qmlPort);
void handleSetupFailed(const QString &reason);
private slots: private slots:
void handleGdbStarted(); void handleGdbStarted();
@@ -56,6 +54,8 @@ private:
void interruptInferior(); void interruptInferior();
void shutdownInferior(); void shutdownInferior();
void shutdownAdapter(); void shutdownAdapter();
void handleRemoteSetupDone(int gdbServerPort, int qmlPort);
void handleRemoteSetupFailed(const QString &reason);
AbstractGdbProcess *gdbProc() { return &m_gdbProc; } AbstractGdbProcess *gdbProc() { return &m_gdbProc; }
DumperHandling dumperHandling() const { return DumperLoadedByGdbPreload; } DumperHandling dumperHandling() const { return DumperLoadedByGdbPreload; }