From 51eff608eb18b01d36fdab442930300a4af3df20 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Thu, 2 Feb 2017 15:16:08 +0100
Subject: Cancel incubation of replaced/destroyed delegates

Resolves the "Object destroyed during incubation" issues.

Task-number: QTBUG-50992
Change-Id: Ie58c958dafbf915da7494dac25351be98106c6ea
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquickcontrol_p_p.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/quicktemplates2/qquickcontrol_p_p.h')

diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 029bb1e9..56a17834 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -117,15 +117,11 @@ public:
     static bool calcHoverEnabled(const QQuickItem *item);
 #endif
 
-    void deleteDelegate(QObject *object);
+    static void destroyDelegate(QObject *object, QObject *parent);
 
     struct ExtraData {
         ExtraData();
         QFont font;
-        // This list contains the default delegates which were
-        // replaced with custom ones via declarative assignments
-        // before Component.completed() was emitted. See QTBUG-50992.
-        QVector<QObject*> pendingDeletions;
     };
     QLazilyAllocated<ExtraData> extra;
 
-- 
cgit v1.2.3