diff options
| author | hjk <hjk121@nokiamail.com> | 2014-11-07 11:58:33 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-11-07 13:57:10 +0100 |
| commit | 1fef3c41b94e9a89dc4f9a0c2707c646f5e8e55c (patch) | |
| tree | 8dfdf76a30373e0fe557d9178b4f21f8dc295433 /share | |
| parent | 5fb0d57d93f07ae7bc3b74bff181a9a8474e5878 (diff) | |
| download | qt-creator-1fef3c41b94e9a89dc4f9a0c2707c646f5e8e55c.tar.gz | |
Debugger: Fix QRegion dumper for Qt 5.4
The layout has changed in ee324e4ed527.
Change-Id: I4b5f47f6526bf1218fdb79dc625f7482af21012b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/qttypes.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 751ff182e8..c4e30491c5 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -1582,14 +1582,20 @@ def qdump__QRegion(d, value): ns = d.qtNamespace() rectType = d.lookupType(ns + "QRect") d.putIntItem("numRects", n) - 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)) + if d.qtVersion() >= 0x050400: + # Changed in ee324e4ed + 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 try: # Can fail if QVector<QRect> debuginfo is missing. vectType = d.lookupType("%sQVector<%sQRect>" % (ns, ns)) - d.putSubItem("rects", d.createValue(pp + v, vectType)) + d.putSubItem("rects", d.createValue(pp + 8, vectType)) except: with SubItem(d, "rects"): d.putItemCount(n) |