aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-10-18 13:11:03 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-10-18 14:42:50 +0000
commit04afbe9e3b7aae98a48337ffd0b4d99858533309 (patch)
treebf676db51c6e6f1270ae9ba66f299cdc36af6880 /src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
parent4077c605ab4c971ccabc37001875cfd19a744e98 (diff)
Material: rewrite the busy indicator animation
Use a simple animated node instead of using the private animator API. Task-number: QTBUG-56601 Change-Id: I9dc474f75b5c5a6fcd8d11735970c1a354ed5b56 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp')
-rw-r--r--src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
index 27d2c5a6..65e9bfe2 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp
@@ -38,7 +38,7 @@
#include "qquickmaterialstyle_p.h"
#include "qquickmaterialtheme_p.h"
-#include "qquickmaterialprogressring_p.h"
+#include "qquickmaterialbusyindicator_p.h"
#include "qquickmaterialprogressstrip_p.h"
#include "qquickmaterialripple_p.h"
@@ -91,9 +91,8 @@ void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, c
QByteArray import = QByteArray(uri) + ".impl";
qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle");
qmlRegisterRevision<QQuickPaddedRectangle, 1>(import, 2, 1);
- qmlRegisterType<QQuickMaterialProgressRing>(import, 2, 0, "ProgressRing");
+ qmlRegisterType<QQuickMaterialBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
qmlRegisterType<QQuickMaterialProgressStrip>(import, 2, 0, "ProgressStrip");
- qmlRegisterType<QQuickMaterialRingAnimator>(import, 2, 0, "RingAnimator");
qmlRegisterType<QQuickMaterialRipple>(import, 2, 0, "Ripple");
qmlRegisterType<QQuickMaterialStripAnimator>(import, 2, 0, "StripAnimator");
qmlRegisterType(typeUrl(QStringLiteral("BoxShadow.qml")), import, 2, 0, "BoxShadow");