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/qml/types/qqmldelegatemodel.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/qml/types/qqmldelegatemodel.cpp')

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 395a3e5641..9b58ec35f8 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -78,6 +78,7 @@ struct QQmlDelegateModelGroupChangeArray : Object {
     void init(const QVector<QQmlChangeSet::Change> &changes);
     void destroy() {
         delete changes;
+        Object::destroy();
     }
 
     QVector<QQmlChangeSet::Change> *changes;
@@ -1872,6 +1873,7 @@ DEFINE_OBJECT_VTABLE(QQmlDelegateModelItemObject);
 void QV4::Heap::QQmlDelegateModelItemObject::destroy()
 {
     item->Dispose();
+    Object::destroy();
 }
 
 
-- 
cgit v1.2.3