diff options
| author | hjk <qtc-committer@nokia.com> | 2012-01-26 18:06:28 +0100 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-01-26 18:09:26 +0100 |
| commit | be4ab29c320bbb6790eba4ab97a5d7d5ffaa7475 (patch) | |
| tree | a5801890af8db838a239e0cf00c06ed976103758 | |
| parent | 000a2b8861588b2d65178ac643e9a0140924685e (diff) | |
| download | qt-creator-be4ab29c320bbb6790eba4ab97a5d7d5ffaa7475.tar.gz | |
debugger: fix argv dumper
Change-Id: I4162aba467aafc235ccc5145cf77e59d6e9e1924
Reviewed-by: hjk <qthjk@ovi.com>
| -rw-r--r-- | share/qtcreator/dumper/dumper.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/dumper/dumper.py index d90429538f..bcb41a7e7f 100644 --- a/share/qtcreator/dumper/dumper.py +++ b/share/qtcreator/dumper/dumper.py @@ -1475,10 +1475,6 @@ class Dumper: self.putBetterType(typeName) return - format = self.formats.get(self.currentIName) - if format is None: - format = self.typeformats.get(stripClassTag(typeName)) - if type.code == ArrayCode: targettype = type.target() self.putAddress(value.address) @@ -1533,6 +1529,9 @@ class Dumper: innerType = type.target() innerTypeName = str(innerType.unqualified()) + format = self.formats.get(self.currentIName) + if format is None: + format = self.typeformats.get(stripForFormat(str(type))) if innerType.code == VoidCode: #warn("VOID POINTER: %s" % format) @@ -1664,6 +1663,10 @@ class Dumper: else: dtypeName = typeName + format = self.formats.get(self.currentIName) + if format is None: + format = self.typeformats.get(stripForFormat(dtypeName)) + if self.useFancy and (format is None or format >= 1): self.putAddress(value.address) self.putType(dtypeName) |