From 5762738fce7306120c1d93da84ef9c2693d95881 Mon Sep 17 00:00:00 2001
From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Tue, 11 Aug 2015 17:55:00 +0200
Subject: [PATCH] Fix crash in QQuickCanvasItem::updatePaintNode()

QQuickCanvasItem manages the life time of the texture
already, so it shouldn't set the ownsTexture flag on the
QSGSimpleTextureNode, because that would result in a double deletion
when QSGSimpleTextureNode::setTexture() is called.

Change-Id: I7c1cc949b664d1a8b64bab092250439171e66233
Task-number: QTBUG-47714
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
---
 src/quick/items/context2d/qquickcanvasitem.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index cb694c499..75507c68d 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -57,7 +57,11 @@ class QQuickCanvasNode : public QSGSimpleTextureNode
 public:
     QQuickCanvasNode() {
         qsgnode_set_description(this, QStringLiteral("canvasnode"));
-        setOwnsTexture(true);
+        setOwnsTexture(false);
+    }
+
+    ~QQuickCanvasNode() {
+        delete texture();
     }
 };
 
-- 
2.34.1