2 files changed, 11 insertions, 2 deletions
diff --git a/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp
index d6cceb2a56..f885c35c59 100644
--- a/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp
+++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator.cpp
@@ -145,8 +145,11 @@ bool QQuickBasicBusyIndicator::isRunning() const
 
 void QQuickBasicBusyIndicator::setRunning(bool running)
 {
-    if (running)
+    m_running = running;
+
+    if (m_running)
         setVisible(true);
+    // Don't set visible to false if not running, because we use an opacity animation (in QML) to hide ourselves.
 }
 
 int QQuickBasicBusyIndicator::elapsed() const
@@ -159,7 +162,12 @@ void QQuickBasicBusyIndicator::itemChange(QQuickItem::ItemChange change, const Q
     QQuickItem::itemChange(change, data);
     switch (change) {
     case ItemOpacityHasChanged:
-        if (qFuzzyIsNull(data.realValue))
+        // If running is set to false and then true within a short period (QTBUG-85860), our
+        // OpacityAnimator cancels the 1 => 0 animation (which was for running being set to false),
+        // setting opacity to 0 and hence visible to false. This happens _after_ setRunning(true)
+        // was called, because the properties were set synchronously but the animation is
+        // asynchronous. To account for this situation, we only hide ourselves if we're not running.
+        if (qFuzzyIsNull(data.realValue) && !m_running)
             setVisible(false);
         break;
     case ItemVisibleHasChanged:
diff --git a/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h
index a39b61cde4..42df13243f 100644
--- a/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h
+++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h
@@ -49,6 +49,7 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
 
 private:
+    bool m_running = false;
     int m_elapsed = 0;
     QColor m_pen;
     QColor m_fill;