diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 12:53:20 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 12:53:20 +0100 |
| commit | 9f831dde07cb2411808534e76669b28a1b76e21d (patch) | |
| tree | ed6252d64c9a3ab27aa93786272cda1b6008f3c7 /share/qtcreator/debugger/gdbbridge.py | |
| parent | cdac81f896ef4b052d76f96485a08e6ec13696b8 (diff) | |
| parent | ea1a92484ac99057b06130a012164bf9788650e9 (diff) | |
| download | qt-creator-wip/clang.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'share/qtcreator/debugger/gdbbridge.py')
| -rw-r--r-- | share/qtcreator/debugger/gdbbridge.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 389f6f91de..25a58f13ce 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -515,13 +515,11 @@ class Dumper(DumperBase): self.autoDerefPointers = "autoderef" in options self.partialUpdate = "partial" in options self.tooltipOnly = "tooltiponly" in options - self.noLocals = "nolocals" in options #warn("NAMESPACE: '%s'" % self.qtNamespace()) #warn("VARIABLES: %s" % varList) #warn("EXPANDED INAMES: %s" % self.expandedINames) #warn("WATCHERS: %s" % watchers) #warn("PARTIAL: %s" % self.partialUpdate) - #warn("NO LOCALS: %s" % self.noLocals) # # Locals @@ -548,7 +546,7 @@ class Dumper(DumperBase): pass varList = [] - if fullUpdateNeeded and not self.tooltipOnly and not self.noLocals: + if fullUpdateNeeded and not self.tooltipOnly: locals = listOfLocals(varList) # Take care of the return value of the last function call. @@ -611,7 +609,6 @@ class Dumper(DumperBase): # with OutputSafer(self): if len(watchers) > 0: - self.put(",") for watcher in watchers.split("##"): (exp, iname) = watcher.split("#") self.handleWatch(exp, iname) @@ -962,7 +959,7 @@ class Dumper(DumperBase): if vtable & 0x3: # This is not a pointer. return False metaObjectEntry = self.dereference(vtable) # It's the first entry. - if metaObjectEntry & 0x3: # This is not a pointer. + if metaObjectEntry & 0x1: # This is not a pointer. return False #warn("MO: 0x%x " % metaObjectEntry) s = gdb.execute("info symbol 0x%x" % metaObjectEntry, to_string=True) @@ -1274,7 +1271,7 @@ class Dumper(DumperBase): # generic pointer." with MinGW's gcc 4.5 when it "identifies" # a "QWidget &" as "void &" and with optimized out code. self.putItem(value.cast(type.target().unqualified())) - self.putBetterType(typeName) + self.putBetterType("%s &" % self.currentType) return except RuntimeError: self.putValue("<optimized out reference>") |