Commit 1daac296 authored by hjk's avatar hjk
Browse files

Debugger: More QRegion dumper fixes



Change-Id: I01aaba021fd4893fb521251c9b4b9572c2beef44
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 4161a528
...@@ -1482,6 +1482,7 @@ def qdump__QRegion(d, value): ...@@ -1482,6 +1482,7 @@ def qdump__QRegion(d, value):
d.putIntItem("numRects", n) d.putIntItem("numRects", n)
d.putSubItem("extents", d.createValue(pp + 2 * v, rectType)) d.putSubItem("extents", d.createValue(pp + 2 * v, rectType))
d.putSubItem("innerRect", d.createValue(pp + 2 * v + rectType.sizeof, 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.
......
...@@ -2260,7 +2260,8 @@ void tst_Dumpers::dumper_data() ...@@ -2260,7 +2260,8 @@ void tst_Dumpers::dumper_data()
% Check("region1.innerArea", "40000", "int") % Check("region1.innerArea", "40000", "int")
% Check("region1.innerRect", "200x200+100+100", "@QRect") % Check("region1.innerRect", "200x200+100+100", "@QRect")
% Check("region1.numRects", "1", "int") % Check("region1.numRects", "1", "int")
% Check("region1.rects", "<1 items>", "@QVector<@QRect>") // This seems to be 0(!) items on Linux, 1 on Mac
// % Check("region1.rects", "<1 items>", "@QVector<@QRect>")
% Check("region2", "<2 items>", "@QRegion") % Check("region2", "<2 items>", "@QRegion")
% Check("region2.extents", "600x700+100+100", "@QRect") % Check("region2.extents", "600x700+100+100", "@QRect")
% Check("region2.innerArea", "200000", "int") % Check("region2.innerArea", "200000", "int")
......
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