1 files changed, 15 insertions, 14 deletions
diff --git a/src/imports/controls/material/qquickmaterialprogressring.cpp b/src/imports/controls/material/qquickmaterialprogressring.cpp
index c11a347f..d21bb0b6 100644
--- a/src/imports/controls/material/qquickmaterialprogressring.cpp
+++ b/src/imports/controls/material/qquickmaterialprogressring.cpp
@@ -67,11 +67,11 @@ public:
     QQuickMaterialRingAnimatorJob();
     ~QQuickMaterialRingAnimatorJob();
 
-    void initialize(QQuickAnimatorController *controller) Q_DECL_OVERRIDE;
-    void updateCurrentTime(int time) Q_DECL_OVERRIDE;
-    void writeBack() Q_DECL_OVERRIDE;
-    void nodeWasDestroyed() Q_DECL_OVERRIDE;
-    void afterNodeSync() Q_DECL_OVERRIDE;
+    void initialize(QQuickAnimatorController *controller) override;
+    void updateCurrentTime(int time) override;
+    void writeBack() override;
+    void nodeWasDestroyed() override;
+    void afterNodeSync() override;
 
 private:
     qreal m_devicePixelRatio;
@@ -134,11 +134,12 @@ QColor QQuickMaterialProgressRing::color() const
 
 void QQuickMaterialProgressRing::setColor(QColor color)
 {
-    if (m_color != color) {
-        m_color = color;
-        update();
-        emit colorChanged();
-    }
+    if (m_color == color)
+        return;
+
+    m_color = color;
+    update();
+    emit colorChanged();
 }
 
 static const int spanAnimationDuration = 700;
@@ -167,8 +168,8 @@ QQuickAnimatorJob *QQuickMaterialRingAnimator::createJob() const
 
 QQuickMaterialRingAnimatorJob::QQuickMaterialRingAnimatorJob() :
     m_devicePixelRatio(1.0),
-    m_containerNode(Q_NULLPTR),
-    m_window(Q_NULLPTR)
+    m_containerNode(nullptr),
+    m_window(nullptr)
 {
 }
 
@@ -258,8 +259,8 @@ void QQuickMaterialRingAnimatorJob::writeBack()
 
 void QQuickMaterialRingAnimatorJob::nodeWasDestroyed()
 {
-    m_containerNode = Q_NULLPTR;
-    m_window = Q_NULLPTR;
+    m_containerNode = nullptr;
+    m_window = nullptr;
 }
 
 void QQuickMaterialRingAnimatorJob::afterNodeSync()