6 files changed, 3 insertions, 25 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 471ca8f2..e5821375 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -92,12 +92,6 @@ T.Button {
             color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor
         }
 
-        Behavior on color {
-            ColorAnimation {
-                duration: 400
-            }
-        }
-
         // The layer is disabled when the button color is transparent so you can do
         // Material.background: "transparent" and get a proper flat button without needing
         // to set Material.elevation as well
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 0721e8f3..c76834bf 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -108,13 +108,6 @@ T.ComboBox {
         radius: control.flat ? 0 : 2
         color: !control.editable ? control.Material.dialogColor : "transparent"
 
-        Behavior on color {
-            enabled: !control.editable
-            ColorAnimation {
-                duration: 400
-            }
-        }
-
         layer.enabled: control.enabled && !control.editable && control.Material.background.a > 0
         layer.effect: ElevationEffect {
             elevation: control.Material.elevation
diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml
index 8bc48784..16f240a2 100644
--- a/src/imports/controls/material/DelayButton.qml
+++ b/src/imports/controls/material/DelayButton.qml
@@ -102,12 +102,6 @@ T.DelayButton {
             }
         }
 
-        Behavior on color {
-            ColorAnimation {
-                duration: 400
-            }
-        }
-
         layer.enabled: control.enabled && control.Material.buttonColor.a > 0
         layer.effect: ElevationEffect {
             elevation: control.Material.elevation
diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml
index 3ce3b39b..249acb20 100644
--- a/src/imports/controls/material/RoundButton.qml
+++ b/src/imports/controls/material/RoundButton.qml
@@ -96,12 +96,6 @@ T.RoundButton {
             color: control.Material.rippleColor
         }
 
-        Behavior on color {
-            ColorAnimation {
-                duration: 400
-            }
-        }
-
         // The layer is disabled when the button color is transparent so that you can do
         // Material.background: "transparent" and get a proper flat button without needing
         // to set Material.elevation as well
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index bec47dda..eb41cfb0 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -20,3 +20,5 @@ include(material.pri)
 
 CONFIG += no_cxx_module
 load(qml_plugin)
+
+requires(qtConfig(quickcontrols2-material))
diff --git a/src/imports/controls/material/qquickmaterialprogressbar_p.h b/src/imports/controls/material/qquickmaterialprogressbar_p.h
index f481281d..981d9bfb 100644
--- a/src/imports/controls/material/qquickmaterialprogressbar_p.h
+++ b/src/imports/controls/material/qquickmaterialprogressbar_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtGui/qcolor.h>
 #include <QtQuick/qquickitem.h>
 
 QT_BEGIN_NAMESPACE