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

debugger: fix QList dumper for large movable objects

Browse Source 
Doh!
(cherry picked from commit df0e1e5625)
This commit is contained in:
hjk
2010-05-20 11:34:00 +02:00
parent 34f24e092f
commit 69c84c9cc3
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
share/qtcreator/gdbmacros/gdbmacros.py
View File

@@ -397,9 +397,9 @@ def qdump__QList(d, item):
# in the frontend.
# So as first approximation only do the 'isLarge' check:
isInternal = innerSize <= d_ptr.type.sizeof and d.isMovableType(innerType)
#warn("INTERNAL: %d" % int(isInternal))
p = gdb.Value(array).cast(innerType.pointer()) + begin
dummyType = gdb.lookup_type("void").pointer().pointer()
innerTypePointer = innerType.pointer()
p = gdb.Value(array).cast(dummyType) + begin
if innerTypeIsPointer:
inner = innerType.target()
else:
@@ -408,10 +408,11 @@ def qdump__QList(d, item):
with Children(d, [size, 2000], inner):
for i in d.childRange():
if isInternal:
d.putItem(Item(p.dereference(), item.iname, i))
pp = p.cast(innerTypePointer).dereference();
d.putItem(Item(pp, item.iname, i))
else:
pp = p.cast(innerType.pointer().pointer()).dereference()
d.putItem(Item(pp.dereference(), item.iname, i))
pp = p.cast(innerTypePointer.pointer()).dereference()
d.putItem(Item(pp, item.iname, i))
p += 1

8
tests/manual/gdbdebugger/simple/app.cpp
View File

@@ -1296,6 +1296,14 @@ void testQVariant2()
void testQVariant3()
{
QVariantList vl;
vl.append(QVariant(1));
vl.append(QVariant(2));
vl.append(QVariant("Some String"));
vl.append(QVariant(21));
vl.append(QVariant(22));
vl.append(QVariant("2Some String"));
QList<int> list;
list << 1 << 2 << 3;
QVariant variant = qVariantFromValue(list);