From 53f692c5756adbf456973c150cea86ca68045f57 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 1 Oct 2009 12:06:15 +0200
Subject: [PATCH] debugger: parse 'at' field in -break-info output as seen with
gdb 6.4
---
src/plugins/debugger/gdb/gdbengine.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index e338d76f7e8..96f9f448c7b 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1762,8 +1762,7 @@ void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt
data->condition = data->bpCondition;
} else if (child.hasName("enabled")) {
data->bpEnabled = (child.data() == "y");
- }
- else if (child.hasName("pending")) {
+ } else if (child.hasName("pending")) {
data->pending = true;
int pos = child.data().lastIndexOf(':');
if (pos > 0) {
@@ -1776,6 +1775,12 @@ void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt
} else {
files.prepend(QString::fromLocal8Bit(child.data()));
}
+ } else if (child.hasName("at")) {
+ // Happens with (e.g.?) gdb 6.4 symbianelf
+ QByteArray ba = child.data();
+ if (ba.startsWith('<') && ba.endsWith('>'))
+ ba = ba.mid(1, ba.size() - 2);
+ data->bpFuncName = _(ba);
}
}
// This field is not present. Contents needs to be parsed from
--
GitLab