summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-12-02 00:14:01 +0100
committerhjk <hjk121@nokiamail.com>2014-12-02 10:39:01 +0100
commitf9f2a75499bc0bc63aab1338b3f6dbc9d2d6f45a (patch)
tree774c74698788003646593ee44426beb6fe3981b4
parent078ea793b6328cf1e4fc073ed9989971e7cf46c9 (diff)
downloadqt-creator-f9f2a75499bc0bc63aab1338b3f6dbc9d2d6f45a.tar.gz
Debugger: Fix QRegion dumper on 32 bit for Qt < 5.4
Change-Id: I2554ae77154d88185120bf661f9e732485d92a28 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--share/qtcreator/debugger/qttypes.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index c4e30491c5..eb94cd6022 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -1587,15 +1587,17 @@ def qdump__QRegion(d, value):
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))
+ rectsOffset = 8
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))
+ rectsOffset = v
# FIXME
try:
# Can fail if QVector<QRect> debuginfo is missing.
vectType = d.lookupType("%sQVector<%sQRect>" % (ns, ns))
- d.putSubItem("rects", d.createValue(pp + 8, vectType))
+ d.putSubItem("rects", d.createValue(pp + rectsOffset, vectType))
except:
with SubItem(d, "rects"):
d.putItemCount(n)