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/qquickspinbox.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/quicktemplates2/qquickspinbox.cpp')

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 4368236a..da3ea40e 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -992,12 +992,7 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator)
     if (d->indicator == indicator)
         return;
 
-    QQuickControl *control = qobject_cast<QQuickControl*>(d->parent);
-    if (control)
-        QQuickControlPrivate::get(control)->deleteDelegate(d->indicator);
-    else
-        delete d->indicator;
-
+    QQuickControlPrivate::destroyDelegate(d->indicator, d->parent);
     d->indicator = indicator;
 
     if (indicator) {
-- 
cgit v1.2.3