aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-10-17 22:04:39 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-10-18 14:42:47 +0000
commit4077c605ab4c971ccabc37001875cfd19a744e98 (patch)
treee0800b6d1bd534582be89078c6f6d7a0c85d3d92 /src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
parent65b690d82fb70e2960a5d2c40a0dac9707718b15 (diff)
Universal: rewrite the busy indicator animation
Use a simple animated node instead of using the private animator API. Task-number: QTBUG-56601 Change-Id: I0ff6c8b55bc4a0a991bcbef8fc18086226beb6b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp')
-rw-r--r--src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
index 394e9162..e6595c72 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
@@ -36,8 +36,8 @@
#include <QtQuickControls2/private/qquickstyleplugin_p.h>
+#include "qquickuniversalbusyindicator_p.h"
#include "qquickuniversalfocusrectangle_p.h"
-#include "qquickuniversalprogressring_p.h"
#include "qquickuniversalprogressstrip_p.h"
#include "qquickuniversalstyle_p.h"
#include "qquickuniversaltheme_p.h"
@@ -88,9 +88,8 @@ void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine,
QByteArray import = QByteArray(uri) + ".impl";
qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle");
+ qmlRegisterType<QQuickUniversalBusyIndicator>(import, 2, 0, "BusyIndicatorImpl");
qmlRegisterRevision<QQuickUniversalFocusRectangle, 1>(import, 2, 1);
- qmlRegisterType<QQuickUniversalProgressRing>(import, 2, 0, "ProgressRing");
- qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 2, 0, "ProgressRingAnimator");
qmlRegisterType<QQuickUniversalProgressStrip>(import, 2, 0, "ProgressStrip");
qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 2, 0, "ProgressStripAnimator");