Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/quickcontrols2/qquickstyle.cpp
	src/quicktemplates2/qquickslider.cpp

Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3

1 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index c48cb56f..18c5affd 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -68,9 +68,9 @@ T.SpinBox {
         text: control.textFromValue(control.value, control.locale)
 
         font: control.font
-        color: enabled ? control.Material.primaryTextColor : control.Material.hintTextColor
+        color: enabled ? control.Material.foreground : control.Material.hintTextColor
         selectionColor: control.Material.textSelectionColor
-        selectedTextColor: control.Material.primaryTextColor
+        selectedTextColor: control.Material.foreground
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: Qt.AlignVCenter
 
@@ -104,14 +104,14 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: Math.min(parent.width / 3, parent.width / 3)
             height: 2
-            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
+            color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor
         }
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: 2
             height: Math.min(parent.width / 3, parent.width / 3)
-            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
+            color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor
         }
     }
 
@@ -138,7 +138,7 @@ T.SpinBox {
             y: (parent.height - height) / 2
             width: parent.width / 3
             height: 2
-            color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
+            color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor
         }
     }