1 files changed, 11 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index be7d35a2..b1522995 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -333,13 +333,19 @@ void QQuickAbstractButtonPrivate::toggle(bool value)
 
 static inline QString indicatorName() { return QStringLiteral("indicator"); }
 
+void QQuickAbstractButtonPrivate::cancelIndicator()
+{
+    Q_Q(QQuickAbstractButton);
+    quickCancelDeferred(q, indicatorName());
+}
+
 void QQuickAbstractButtonPrivate::executeIndicator(bool complete)
 {
-    Q_Q(QQuickControl);
+    Q_Q(QQuickAbstractButton);
     if (indicator.wasExecuted())
         return;
 
-    if (!indicator)
+    if (!indicator || complete)
         quickBeginDeferred(q, indicatorName(), indicator);
     if (complete)
         quickCompleteDeferred(q, indicatorName(), indicator);
@@ -649,6 +655,9 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator)
     if (d->indicator == indicator)
         return;
 
+    if (!d->indicator.isExecuting())
+        d->cancelIndicator();
+
     delete d->indicator;
     d->indicator = indicator;
     if (indicator) {