From e5d62f3e7e4ddd60192fa140ec3af33417816212 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 27 Oct 2015 10:53:48 +0100 Subject: [PATCH] Debugger: Fix of display of object addresses Task-number: QTCREATORBUG-15236 Change-Id: Ic8f6fd60d185b759ee13dade3a18c2d955303cdf Reviewed-by: hjk Reviewed-by: David Schulz --- share/qtcreator/debugger/qttypes.py | 2 +- src/libs/qtcreatorcdbext/symbolgroupnode.cpp | 4 ++-- src/plugins/debugger/watchdata.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 5518a120659..416d63e1ffd 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -1269,7 +1269,7 @@ def _qdump__QObject(d, value): d.putField("keyencoded", Hex2EncodedLatin1) qq = q.cast(valuesType.pointer().pointer()) qq = qq.dereference(); - d.putField("addr", d.cleanAddress(qq)) + d.putField("address", d.cleanAddress(qq)) d.putField("exp", "*(%s*)%s" % (variant, d.cleanAddress(qq))) t = qdump__QVariant(d, qq) diff --git a/src/libs/qtcreatorcdbext/symbolgroupnode.cpp b/src/libs/qtcreatorcdbext/symbolgroupnode.cpp index a4f39dd41f4..aefe0d12d30 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupnode.cpp +++ b/src/libs/qtcreatorcdbext/symbolgroupnode.cpp @@ -1119,7 +1119,7 @@ int SymbolGroupNode::dumpNode(std::ostream &str, std::wstring value = simpleDumpValue(ctx, &encoding); if (addr) { - str << std::hex << std::showbase << ",addr=\"" << addr << '"'; + str << std::hex << std::showbase << ",address=\"" << addr << '"'; if (SymbolGroupValue::isPointerType(t)) { std::string::size_type pointerPos = value.rfind(L"0x"); if (pointerPos != std::string::npos) { @@ -1602,7 +1602,7 @@ int MapNodeSymbolGroupNode::dump(std::ostream &str, const std::string &visitingF { SymbolGroupNode::dumpBasicData(str, name(), visitingFullIname); if (m_address) - str << ",addr=\"0x" << std::hex << m_address << '"'; + str << ",address=\"0x" << std::hex << m_address << '"'; str << ",type=\"" << m_type << "\",valueencoded=\"0\",value=\"\",valueenabled=\"false\"" ",valueeditable=\"false\""; return 2; diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index 8b271c92b1a..c95b94b4213 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -562,7 +562,7 @@ void parseChildrenData(const WatchData &data0, const GdbMi &item, if (mi.isValid()) data.origaddr = mi.toAddress(); - mi = item["addr"]; + mi = item["address"]; if (mi.isValid()) setWatchDataAddress(data, mi.toAddress());