summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.cpp
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-12-04 15:10:06 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-12-04 15:10:06 (GMT)
commit452a938862c74f64ebc93fcf82fedd476f0e7bd7 (patch)
treefee118487794242104f1e5a6cda7d732e7c97810 /src/gui/graphicsview/qgraphicsitem.cpp
parentd4228d023a19ecc2ebad9b63e08dbf6c1075ac40 (diff)
parent39392326c8c843a6f46b864c6595a5241a47af10 (diff)
downloadQt-452a938862c74f64ebc93fcf82fedd476f0e7bd7.zip
Qt-452a938862c74f64ebc93fcf82fedd476f0e7bd7.tar.gz
Qt-452a938862c74f64ebc93fcf82fedd476f0e7bd7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index bb45e7e..b54596b 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1341,8 +1341,8 @@ QGraphicsItem::~QGraphicsItem()
}
if (!d_ptr->children.isEmpty()) {
- QList<QGraphicsItem *> oldChildren = d_ptr->children;
- qDeleteAll(oldChildren);
+ while (!d_ptr->children.isEmpty())
+ delete d_ptr->children.first();
Q_ASSERT(d_ptr->children.isEmpty());
}