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)