feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix QRegion dumper for Qt 5.4

Browse Source 
The layout has changed in ee324e4ed527.

Change-Id: I4b5f47f6526bf1218fdb79dc625f7482af21012b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-11-07 11:58:33 +01:00
parent 5fb0d57d93
commit 1fef3c41b9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/debugger/qttypes.py
View File

@@ -1582,14 +1582,20 @@ def qdump__QRegion(d, value):
ns = d.qtNamespace() ns = d.qtNamespace()
rectType = d.lookupType(ns + "QRect") rectType = d.lookupType(ns + "QRect")
d.putIntItem("numRects", n) d.putIntItem("numRects", n)
d.putSubItem("extents", d.createValue(pp + 2 * v, rectType)) if d.qtVersion() >= 0x050400:
d.putSubItem("innerRect", d.createValue(pp + 2 * v + rectType.sizeof, rectType)) # Changed in ee324e4ed
d.putIntItem("innerArea", d.extractInt(pp + 2 * v + 2 * rectType.sizeof)) d.putSubItem("extents", d.createValue(pp + 8 + v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 8 + v + rectType.sizeof, rectType))
d.putIntItem("innerArea", d.extractInt(pp + 4))
else:
d.putSubItem("extents", d.createValue(pp + 2 * v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 2 * v + rectType.sizeof, rectType))
d.putIntItem("innerArea", d.extractInt(pp + 2 * v + 2 * rectType.sizeof))
# FIXME # FIXME
try: try:
# Can fail if QVector<QRect> debuginfo is missing. # Can fail if QVector<QRect> debuginfo is missing.
vectType = d.lookupType("%sQVector<%sQRect>" % (ns, ns)) vectType = d.lookupType("%sQVector<%sQRect>" % (ns, ns))
d.putSubItem("rects", d.createValue(pp + v, vectType)) d.putSubItem("rects", d.createValue(pp + 8, vectType))
except: except:
with SubItem(d, "rects"): with SubItem(d, "rects"):
d.putItemCount(n) d.putItemCount(n)