From bea8a8d79fdbb6e84bfb5e667b3f312cebf7946a Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 18 Oct 2016 20:05:21 +0200 Subject: Material: rewrite the indeterminate progress bar animation Use a simple animated node instead of using the private animator API. Task-number: QTBUG-56601 Change-Id: I40cf3a8b762c37ce6e93cedf4f77fe53ad457d8f Reviewed-by: Mitch Curtis --- .../controls/material/qtquickcontrols2materialstyleplugin.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp') diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index 65e9bfe2..bf617488 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -39,7 +39,7 @@ #include "qquickmaterialstyle_p.h" #include "qquickmaterialtheme_p.h" #include "qquickmaterialbusyindicator_p.h" -#include "qquickmaterialprogressstrip_p.h" +#include "qquickmaterialprogressbar_p.h" #include "qquickmaterialripple_p.h" #include @@ -92,9 +92,8 @@ void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, c qmlRegisterType(import, 2, 0, "PaddedRectangle"); qmlRegisterRevision(import, 2, 1); qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); - qmlRegisterType(import, 2, 0, "ProgressStrip"); + qmlRegisterType(import, 2, 0, "ProgressBarImpl"); qmlRegisterType(import, 2, 0, "Ripple"); - qmlRegisterType(import, 2, 0, "StripAnimator"); qmlRegisterType(typeUrl(QStringLiteral("BoxShadow.qml")), import, 2, 0, "BoxShadow"); qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); qmlRegisterType(typeUrl(QStringLiteral("ElevationEffect.qml")), import, 2, 0, "ElevationEffect"); -- cgit v1.2.3