Commit e5d62f3e authored by hjk's avatar hjk Committed by David Schulz

Debugger: Fix of display of object addresses

Task-number: QTCREATORBUG-15236
Change-Id: Ic8f6fd60d185b759ee13dade3a18c2d955303cdf
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
Reviewed-by: default avatarDavid Schulz <david.schulz@theqtcompany.com>
parent be43c758
......@@ -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)
......
......@@ -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;
......
......@@ -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());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment