summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-04 02:53:44 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-04 02:53:44 (GMT)
commitf6f290ba3f36e0a686dffeaf0a4b4bd85b414172 (patch)
tree23dc393f6fd0f8bd0485c82edce14501852f1171
parentbc4302d4c206cf0c60f214cbf5e75d1ce70e7503 (diff)
parent5d3db0fbfa96964b9448705d9edd4c0cd9e65816 (diff)
downloadQt-f6f290ba3f36e0a686dffeaf0a4b4bd85b414172.zip
Qt-f6f290ba3f36e0a686dffeaf0a4b4bd85b414172.tar.gz
Qt-f6f290ba3f36e0a686dffeaf0a4b4bd85b414172.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index b973d6c..a6c40c5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -761,8 +761,7 @@ QmlGraphicsVisualDataModel::ReleaseFlags QmlGraphicsVisualDataModel::release(Qml
if (inPackage)
emit destroyingPackage(qobject_cast<QmlPackage*>(obj));
stat |= Destroyed;
- obj->setParent(0);
- obj->deleteLater();
+ delete obj;
} else if (!inPackage) {
stat |= Referenced;
}