Commit a215bdac authored by hjk's avatar hjk

Debugger: Fix QObject property dumper for Qt 5.6.0/32 bit

Change-Id: Ie9d4fb069616464cff44909ed30d242741ef3180
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 3d357e10
......@@ -1547,10 +1547,9 @@ class DumperBase:
def vectorChildrenGenerator(self, addr, innerType):
base = self.extractPointer(addr)
size = self.extractInt(base + 4)
data = base + self.extractPointer(base + 8 + self.ptrSize())
data, size, alloc = self.vectorDataHelper(base)
for i in range(size):
yield self.createValue(data + i * 16, innerType)
yield self.createValue(data + i * innerType.size(), innerType)
def putTypedPointer(self, name, addr, typeName):
""" Prints a typed pointer, expandable if the type can be resolved,
......@@ -3182,7 +3181,10 @@ class DumperBase:
elif typish == "QImage":
typish = self.qtNamespace() + typish
size = 2 * self.ptrSize()
elif typish in ("QVariant", "QPointF", "QDateTime", "QRect"):
elif typish == "QVariant":
typish = self.qtNamespace() + typish
size = 8 + self.ptrSize()
elif typish in ("QPointF", "QDateTime", "QRect"):
typish = self.qtNamespace() + typish
size = 16
elif typish == "QPoint":
......
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