aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquicklabel_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-02-02 15:16:08 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-02-10 10:36:47 +0000
commit51eff608eb18b01d36fdab442930300a4af3df20 (patch)
tree9822c3c454a97dcd627e4601dedc81bcfde98e46 /src/quicktemplates2/qquicklabel_p_p.h
parent13ece44c44b4214b568ca3638ef62e0f1af04d7f (diff)
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>
Diffstat (limited to 'src/quicktemplates2/qquicklabel_p_p.h')
-rw-r--r--src/quicktemplates2/qquicklabel_p_p.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index 9bc7c36d..40445d36 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -84,15 +84,9 @@ 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