diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-18 15:36:26 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-19 11:33:02 +0000 |
commit | dba57ed6f4c9fda4b6fd8b1aa1d61c31dcebd85e (patch) | |
tree | 0320a020af60d9d3f20a824df3700df0416f4cad /src/imports/controls/qtquickcontrols2plugin.cpp | |
parent | bea8a8d79fdbb6e84bfb5e667b3f312cebf7946a (diff) |
Default: rewrite the indeterminate progress bar animation
Use a simple animated node instead of using the private animator API.
Task-number: QTBUG-56601
Change-Id: Id8deb1e6ae48554bfa7b26b333247bf08c27aa09
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
-rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index db853f56..6802171f 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -48,9 +48,9 @@ #include <QtQuickControls2/private/qquicktumblerview_p.h> #include "qquickdefaultbusyindicator_p.h" +#include "qquickdefaultprogressbar_p.h" #include "qquickdefaultstyle_p.h" #include "qquickdialring_p.h" -#include "qquickprogressstrip_p.h" static inline void initResources() { @@ -164,8 +164,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur const QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); - qmlRegisterType<QQuickProgressStrip>(import, 2, 0, "ProgressStrip"); - qmlRegisterType<QQuickProgressAnimator>(import, 2, 0, "ProgressStripAnimator"); + qmlRegisterType<QQuickDefaultProgressBar>(import, 2, 0, "ProgressBarImpl"); qmlRegisterType<QQuickDialRing>(import, 2, 0, "DialRing"); qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView"); qmlRegisterSingletonType<QQuickDefaultStyle>(import, 2, 1, "Default", styleSingleton); |