diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-02-02 15:16:08 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-02-10 10:36:47 +0000 |
| commit | 51eff608eb18b01d36fdab442930300a4af3df20 (patch) | |
| tree | 9822c3c454a97dcd627e4601dedc81bcfde98e46 /src/quicktemplates2/qquickcontrol_p_p.h | |
| parent | 13ece44c44b4214b568ca3638ef62e0f1af04d7f (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/qquickcontrol_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
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; |