1 files changed, 7 insertions, 18 deletions
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml
index 3077ceb7..63d0d49b 100644
--- a/src/imports/controls/material/BusyIndicator.qml
+++ b/src/imports/controls/material/BusyIndicator.qml
@@ -35,9 +35,9 @@
 ****************************************************************************/
 
 import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import QtQuick.Controls.Material 2.1
-import QtQuick.Controls.Material.impl 2.1
+import QtQuick.Templates 2.2 as T
+import QtQuick.Controls.Material 2.2
+import QtQuick.Controls.Material.impl 2.2
 
 T.BusyIndicator {
     id: control
@@ -47,24 +47,13 @@ T.BusyIndicator {
 
     padding: 6
 
-    contentItem: ProgressRing {
-        id: ring
-        x: control.leftPadding + (control.availableWidth - width) / 2
-        y: control.topPadding + (control.availableHeight - height) / 2
+    contentItem: BusyIndicatorImpl {
         implicitWidth: 48
         implicitHeight: 48
-        width: size
-        height: size
-        opacity: control.running ? 1 : 0
         color: control.Material.accentColor
 
-        readonly property real size: Math.min(control.availableWidth, control.availableHeight)
-
-        Behavior on opacity { OpacityAnimator { duration: 250 } }
-
-        RingAnimator {
-            target: ring
-            running: control.visible && control.running
-        }
+        opacity: control.running ? 1 : 0
+        visible: control.running || animator.running
+        Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } }
     }
 }