From d99e0764e2fe9bc7e652474b5d70e8b66154b807 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Wed, 7 Sep 2016 15:49:37 +0200
Subject: Delete replaced delegates after Component.completed() is emitted

This avoids the issue "Object destroyed during incubation" error.
A proper fix is still required in the QML engine.

Change-Id: I3c168cfe2d8c295662bcb5886e99a0f95748e302
Task-number: QTBUG-50992
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/quicktemplates2/qquicklabel_p_p.h | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index 2c8a3362..f5185768 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -83,9 +83,15 @@ public:
     QAccessible::Role accessibleRole() const override;
 #endif
 
+    void deleteDelegate(QObject *object);
+
     QFont font;
     QQuickItem *background;
     QQuickAccessibleAttached *accessibleAttached;
+    // 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;
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3