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

Conflicts:
	src/quickcontrols2/qquickchecklabel.cpp
	src/quickcontrols2/qquickchecklabel_p.h
	src/quickcontrols2/qquickmnemoniclabel_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquickswipedelegate.cpp

Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c

1 files changed, 27 insertions, 7 deletions

diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 05f64124..30da70f4 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -52,22 +52,42 @@ T.Switch {
     padding: 6
     spacing: 6
 
-    indicator: SwitchIndicator {
+    indicator: PaddedRectangle {
+        implicitWidth: 56
+        implicitHeight: 28
+
         x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
-        control: control
+
+        radius: 8
+        leftPadding: 0
+        rightPadding: 0
+        padding: (height - 16) / 2
+        color: control.checked ? control.palette.dark : control.palette.midlight
+
+        Rectangle {
+            x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2)))
+            y: (parent.height - height) / 2
+            width: 28
+            height: 28
+            radius: 16
+            color: control.down ? control.palette.light : control.palette.window
+            border.width: control.visualFocus ? 2 : 1
+            border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
+
+            Behavior on x {
+                enabled: !control.down
+                SmoothedAnimation { velocity: 200 }
+            }
+        }
     }
 
-    contentItem: Text {
+    contentItem: CheckLabel {
         leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0
 
         text: control.text
         font: control.font
         color: control.palette.windowText
-        elide: Text.ElideRight
-        visible: control.text
-        horizontalAlignment: Text.AlignLeft
-        verticalAlignment: Text.AlignVCenter
     }
 }