diff options
author | Charles Yin <charles.yin@nokia.com> | 2011-10-11 11:37:49 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 02:36:56 +0200 |
commit | 23b59c127a320f6d7851bc05d17d08cfecbd2879 (patch) | |
tree | 62bee406b080fa7dcfc39c6a2e39dccd17fbd102 | |
parent | f1972c0cbc987a28b0bc3dce0ee03c6f4b3bad85 (diff) |
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>
-rw-r--r-- | src/declarative/items/context2d/qsgcanvasitem.cpp | 4 | ||||
-rw-r--r-- | src/declarative/items/context2d/qsgcontext2dnode.cpp | 1 | ||||
-rw-r--r-- | src/declarative/items/context2d/qsgcontext2dtexture.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp index 43bb734a41..3445cf01d0 100644 --- 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 e20d649c9c..87de8cf157 100644 --- 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 617d66609d..8e22cebe70 100644 --- 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 |