fix crash bug when unloading canvas

Task-number:QTBUG-21935
Change-Id: If4a2a92b2f53cf81a48d023df8a1e6d11e522e0d
Reviewed-on: http://codereview.qt-project.org/6370
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>

diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp
index 43bb734..3445cf0 100644 (file)
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qsgcanvasitem.cpp
@@ -184,10 +184,6 @@ QSGCanvasItem::QSGCanvasItem(QSGItem *parent)
 QSGCanvasItem::~QSGCanvasItem()
 {
     Q_D(QSGCanvasItem);
-    if (d->texture) {
-        d->texture->setItem(0);
-        d->texture->deleteLater();
-    }
     delete d->context;
 }
 

diff --git a/src/declarative/items/context2d/qsgcontext2dnode.cpp b/src/declarative/items/context2d/qsgcontext2dnode.cpp
index e20d649..87de8cf 100644 (file)
--- a/src/declarative/items/context2d/qsgcontext2dnode.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dnode.cpp
@@ -64,6 +64,7 @@ QSGContext2DNode::QSGContext2DNode(QSGCanvasItem* item)
 
 QSGContext2DNode::~QSGContext2DNode()
 {
+    delete m_texture;
 }
 
 void QSGContext2DNode::setSize(const QSizeF& size)

diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
index 617d666..8e22ceb 100644 (file)
--- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
@@ -656,7 +656,7 @@ QSGContext2DImageTexture::QSGContext2DImageTexture(bool threadRendering)
 
 QSGContext2DImageTexture::~QSGContext2DImageTexture()
 {
-    m_texture->deleteLater();
+    delete m_texture;
 }
 
 int QSGContext2DImageTexture::textureId() const