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

Re-enable "set target-async on" and make failure non-fatal

Browse Source
This commit is contained in:
ck
2009-10-16 15:05:30 +02:00
parent 3e3422df09
commit 42d3ada0b4
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/gdb/remotegdbadapter.cpp
View File

@@ -164,32 +164,20 @@ void RemoteGdbAdapter::startInferior()
m_engine->postCommand(_("-exec-arguments ") m_engine->postCommand(_("-exec-arguments ")
+ startParameters().processArgs.join(_(" "))); + startParameters().processArgs.join(_(" ")));
#if 0
m_engine->postCommand(_("set target-async on"), CB(handleSetTargetAsync)); m_engine->postCommand(_("set target-async on"), CB(handleSetTargetAsync));
#else
QFileInfo fi(startParameters().executable); QFileInfo fi(startParameters().executable);
QString fileName = fi.absoluteFilePath(); QString fileName = fi.absoluteFilePath();
m_engine->postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName), m_engine->postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName),
CB(handleFileExecAndSymbols)); CB(handleFileExecAndSymbols));
#endif
} }
#if 0
void RemoteGdbAdapter::handleSetTargetAsync(const GdbResponse &response) void RemoteGdbAdapter::handleSetTargetAsync(const GdbResponse &response)
{ {
QTC_ASSERT(state() == InferiorStarting, qDebug() << state()); QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultError)
//qq->breakHandler()->setAllPending(); qDebug() << "Adapter too old: does not support asynchronous mode.";
QFileInfo fi(startParameters().executable);
QString fileName = fi.absoluteFilePath();
m_engine->postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName),
CB(handleFileExecAndSymbols));
} else {
QString msg = tr("Adapter too old: does not support asynchronous mode.");
emit inferiorStartFailed(msg);
}
} }
#endif
void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response) void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
{ {

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

@@ -64,9 +64,7 @@ private:
Q_SLOT void readUploadStandardError(); Q_SLOT void readUploadStandardError();
Q_SLOT void uploadProcError(QProcess::ProcessError error); Q_SLOT void uploadProcError(QProcess::ProcessError error);
#if 0
void handleSetTargetAsync(const GdbResponse &response); void handleSetTargetAsync(const GdbResponse &response);
#endif
void handleFileExecAndSymbols(const GdbResponse &response); void handleFileExecAndSymbols(const GdbResponse &response);
void handleTargetRemote(const GdbResponse &response); void handleTargetRemote(const GdbResponse &response);
void handleKill(const GdbResponse &response); void handleKill(const GdbResponse &response);