From 57c9d6969ac474177c77d5ea59768b39620a3b2f Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@digia.com>
Date: Fri, 9 Sep 2016 16:20:57 +0200
Subject: QML: Also check for correct destroy() chaining

Check that the destroy() method of Heap::Base was called when a Managed
object needs destruction. This checks if a call to the parent's
destroy() method was accidentally omitted.

Change-Id: Id025ecd6d4744bf3eab23503fbe317ed2a461138
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/items/context2d/qquickcontext2d.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/quick/items/context2d')

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index d94a098897..2483a8eadb 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -504,7 +504,10 @@ struct QQuickContext2DStyle : Object {
         patternRepeatX = false;
         patternRepeatY = false;
     }
-    void destroy() { delete brush; }
+    void destroy() {
+        delete brush;
+        Object::destroy();
+    }
 
     QBrush *brush;
     bool patternRepeatX:1;
@@ -513,7 +516,10 @@ struct QQuickContext2DStyle : Object {
 
 struct QQuickJSContext2DPixelData : Object {
     void init();
-    void destroy() { delete image; }
+    void destroy() {
+        delete image;
+        Object::destroy();
+    }
 
     QImage *image;
 };
-- 
cgit v1.2.3