summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-12-04 02:12:51 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-12-04 02:12:51 (GMT)
commitbc4302d4c206cf0c60f214cbf5e75d1ce70e7503 (patch)
tree32710ea1888f16d6b1528f41863017fd95a5f6fe
parentc37cdb5a8e8eea672fa59a3cb427b74d6a928a30 (diff)
parent7f5160ca67a5b4a4a64fa78c678834c0a97b9ee2 (diff)
downloadQt-bc4302d4c206cf0c60f214cbf5e75d1ce70e7503.zip
Qt-bc4302d4c206cf0c60f214cbf5e75d1ce70e7503.tar.gz
Qt-bc4302d4c206cf0c60f214cbf5e75d1ce70e7503.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/graphicsitems/qmlgraphicstext.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 854d503..ad12189 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -121,8 +121,6 @@ QmlGraphicsText::~QmlGraphicsText()
QmlGraphicsTextPrivate::~QmlGraphicsTextPrivate()
{
- delete control;
- delete doc;
}
/*!