From e0a6b45f22963e745a7735c36e6b477bc7d03bdd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 13 Oct 2016 12:41:31 +0200 Subject: [PATCH] Dumper: Fix padding handling (32bit) This also reverts 3d68a8d0dec033eebef7d0ead082a291afa9454d. Change-Id: I3e527096b4d36a102f010e538e428654cc3b783c Reviewed-by: hjk --- share/qtcreator/debugger/dumper.py | 6 +++++- share/qtcreator/debugger/qttypes.py | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index a1ee6a6d3cd..c0264a1fdb3 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -2999,6 +2999,8 @@ class DumperBase: return self.code in (TypeCodeIntegral, TypeCodeFloat, TypeCodeEnum) def alignment(self): + if self.code == TypeCodeTypedef: + return self.stripTypedefs().alignment() if self.isSimpleType(): if self.name == 'double': return self.dumper.ptrSize() # Crude approximation. @@ -3371,7 +3373,9 @@ class DumperBase: builder.addField(ptrSize, 'Q' if ptrSize == 8 else 'I') elif c == 'P': # Pointer as Value builder.addField(ptrSize, '%ss' % ptrSize) - elif c in ('q', 'Q', 'd'): + elif c in ('d'): + builder.addField(8, c, fieldType = 'double') + elif c in ('q', 'Q'): builder.addField(8, c) elif c in ('i', 'I', 'f'): builder.addField(4, c) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 0dd094906b8..5ce5531c682 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -821,12 +821,8 @@ def qdump__QImage(d, value): d.putValue('(invalid)') return - if d.ptrSize() == 8: - (ref, width, height, depth, nbytes, padding, devicePixelRatio, colorTable, - bits, iformat) = d.split('iiiii@dppi', imageData) - else: - (ref, width, height, depth, nbytes, devicePixelRatio, colorTable, - bits, iformat) = d.split('iiiiidppi', imageData) + (ref, width, height, depth, nbytes, padding, devicePixelRatio, colorTable, + bits, iformat) = d.split('iiiii@dppi', imageData) d.putValue('(%dx%d)' % (width, height)) d.putNumChild(1)