From aae1162b705dad50a75a7576cd58ac14d989922b Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 3 Sep 2009 13:25:23 +0200 Subject: debugger: fix child count in QAbstractItem dumpers (cherry picked from commit b69fad927af4619c813c9cbc7fb9cf898d439333) --- share/qtcreator/gdbmacros/gdbmacros.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 6821153d0f..ac91ff1b08 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -1031,7 +1031,7 @@ static void qDumpQAbstractItem(QDumper &d) //d.putItem("value", "(").put(rowCount).put(",").put(columnCount).put(")"); d.putItem("value", m->data(mi, Qt::DisplayRole).toString()); d.putItem("valueencoded", "2"); - d.putItem("numchild", "1"); + d.putItem("numchild", rowCount * columnCount); if (d.dumpChildren) { d.beginChildren(); for (int row = 0; row < rowCount; ++row) { @@ -1042,7 +1042,7 @@ static void qDumpQAbstractItem(QDumper &d) d.put("[").put(row).put(",").put(column).put("]"); d.endItem(); //d.putItem("numchild", (m->hasChildren(child) ? "1" : "0")); - d.putItem("numchild", "1"); + d.putItem("numchild", m->rowCount(child) * m->columnCount(child)); d.beginItem("addr"); d.put("$").put(child.row()).put(",").put(child.column()).put(",") .put(child.internalPointer()).put(",").put(child.model()); @@ -1104,7 +1104,7 @@ static void qDumpQAbstractItemModel(QDumper &d) d.putItem("value", m.data(mi, Qt::DisplayRole).toString()); d.putItem("valueencoded", "2"); //d.putItem("numchild", (m.hasChildren(mi) ? "1" : "0")); - d.putItem("numchild", "1"); + d.putItem("numchild", m.rowCount(mi) * m.columnCount(mi)); d.beginItem("addr"); d.put("$").put(mi.row()).put(",").put(mi.column()).put(","); d.put(mi.internalPointer()).put(",").put(mi.model()); -- cgit v1.2.3