From 42d3ada0b486b2b62a0a13cc0aea431341fee55a Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Fri, 16 Oct 2009 15:05:30 +0200
Subject: [PATCH] Re-enable "set target-async on" and make failure non-fatal
---
src/plugins/debugger/gdb/remotegdbadapter.cpp | 18 +++---------------
src/plugins/debugger/gdb/remotegdbadapter.h | 2 --
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index d6fdb3381a6..b1f8e7a70df 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -164,32 +164,20 @@ void RemoteGdbAdapter::startInferior()
m_engine->postCommand(_("-exec-arguments ")
+ startParameters().processArgs.join(_(" ")));
-#if 0
m_engine->postCommand(_("set target-async on"), CB(handleSetTargetAsync));
-#else
+
QFileInfo fi(startParameters().executable);
QString fileName = fi.absoluteFilePath();
m_engine->postCommand(_("-file-exec-and-symbols \"%1\"").arg(fileName),
CB(handleFileExecAndSymbols));
-#endif
}
-#if 0
void RemoteGdbAdapter::handleSetTargetAsync(const GdbResponse &response)
{
QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
- if (response.resultClass == GdbResultDone) {
- //qq->breakHandler()->setAllPending();
- 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);
- }
+ if (response.resultClass == GdbResultError)
+ qDebug() << "Adapter too old: does not support asynchronous mode.";
}
-#endif
void RemoteGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
{
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.h b/src/plugins/debugger/gdb/remotegdbadapter.h
index 38fc7ac6555..75305bbd25c 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.h
+++ b/src/plugins/debugger/gdb/remotegdbadapter.h
@@ -64,9 +64,7 @@ private:
Q_SLOT void readUploadStandardError();
Q_SLOT void uploadProcError(QProcess::ProcessError error);
-#if 0
void handleSetTargetAsync(const GdbResponse &response);
-#endif
void handleFileExecAndSymbols(const GdbResponse &response);
void handleTargetRemote(const GdbResponse &response);
void handleKill(const GdbResponse &response);
--
GitLab