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

Conflicts:
	src/quicktemplates2/qquickswitch.cpp
	src/quicktemplates2/qquickswitchdelegate.cpp
	tests/auto/controls/data/tst_dialogbuttonbox.qml
	tests/auto/controls/data/tst_toolbutton.qml

Change-Id: I1da1d6de83c1d9ac854dfce1d6c9d6ba2c460404

5 files changed, 67 insertions, 9 deletions

diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index a851c435..17bc31f2 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -103,9 +103,14 @@ TestCase {
         verify(cancelButton)
         compare(okButton.text.toUpperCase(), "OK")
         compare(cancelButton.text.toUpperCase(), "CANCEL")
+        compare(control.standardButton(DialogButtonBox.Ok), okButton)
+        compare(control.standardButton(DialogButtonBox.Cancel), cancelButton)
 
         control.standardButtons = 0
         compare(control.count, 0)
+
+        compare(control.standardButton(DialogButtonBox.Ok), null)
+        compare(control.standardButton(DialogButtonBox.Cancel), null)
     }
 
     function test_attached() {
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 73a122bc..ab6068eb 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -116,9 +116,21 @@ TestCase {
         compare(control.up.indicator.enabled, true)
         compare(control.down.indicator.enabled, false)
 
+        control.value = 30
+        compare(control.from, 25)
+        compare(control.value, 30)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, true)
+
+        control.from = 30
+        compare(control.from, 30)
+        compare(control.value, 30)
+        compare(control.up.indicator.enabled, true)
+        compare(control.down.indicator.enabled, false)
+
         control.to = 75
         compare(control.to, 75)
-        compare(control.value, 25)
+        compare(control.value, 30)
         compare(control.up.indicator.enabled, true)
         compare(control.down.indicator.enabled, false)
 
@@ -127,7 +139,14 @@ TestCase {
         compare(control.up.indicator.enabled, true)
         compare(control.down.indicator.enabled, true)
 
-        control.to = 40;
+        control.to = 50
+        compare(control.to, 50)
+        compare(control.value, 50)
+        compare(control.up.indicator.enabled, false)
+        compare(control.down.indicator.enabled, true)
+
+        control.to = 40
+        compare(control.to, 40)
         compare(control.value, 40)
         compare(control.up.indicator.enabled, false)
         compare(control.down.indicator.enabled, true)
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 2b050d14..6e424609 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -185,6 +185,23 @@ TestCase {
         compare(control.pressed, false)
         verify(spy.success)
 
+        // release in the middle
+        spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
+                                "pressed"]
+        mousePress(control, 0, 0, Qt.LeftButton)
+        compare(control.pressed, true)
+        verify(spy.success)
+        mouseMove(control, control.width / 4, control.height / 4, 0, Qt.LeftButton)
+        compare(control.pressed, true)
+        spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
+                                "released",
+                                "clicked"]
+        mouseRelease(control, control.width / 4, control.height / 4, Qt.LeftButton)
+        compare(control.checked, false)
+        compare(control.pressed, false)
+        tryCompare(control, "position", 0) // QTBUG-57944
+        verify(spy.success)
+
         // right button
         spy.expectedSequence = []
         mousePress(control, control.width / 2, control.height / 2, Qt.RightButton)
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 3f591602..490afd51 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -181,6 +181,23 @@ TestCase {
         compare(control.pressed, false)
         verify(spy.success)
 
+        // release in the middle
+        spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
+                                "pressed"]
+        mousePress(control.indicator, 0, 0, Qt.LeftButton)
+        compare(control.pressed, true)
+        verify(spy.success)
+        mouseMove(control.indicator, control.indicator.width / 2 - 1, 0)
+        compare(control.pressed, true)
+        spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
+                                "released",
+                                "clicked"]
+        mouseRelease(control.indicator, control.indicator.width / 2 - 1, 0, Qt.LeftButton)
+        compare(control.checked, false)
+        compare(control.pressed, false)
+        tryCompare(control, "position", 0) // QTBUG-57944
+        verify(spy.success)
+
         // right button
         spy.expectedSequence = []
         mousePress(control, control.width / 2, control.height / 2, Qt.RightButton)
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 88afeeb3..be9ce95f 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -85,12 +85,12 @@ TestCase {
         verify(clickedSpy.valid)
 
         // check
-        mousePress(control, control.width / 2, control.height / 2, Qt.LeftToolButton)
+        mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(pressedSpy.count, 1)
         compare(downSpy.count, 1)
         compare(control.pressed, true)
         compare(control.down, true)
-        mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftToolButton)
+        mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(clickedSpy.count, 1)
         compare(pressedSpy.count, 2)
         compare(downSpy.count, 2)
@@ -98,12 +98,12 @@ TestCase {
         compare(control.down, false)
 
         // uncheck
-        mousePress(control, control.width / 2, control.height / 2, Qt.LeftToolButton)
+        mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(pressedSpy.count, 3)
         compare(downSpy.count, 3)
         compare(control.pressed, true)
         compare(control.down, true)
-        mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftToolButton)
+        mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(clickedSpy.count, 2)
         compare(pressedSpy.count, 4)
         compare(downSpy.count, 4)
@@ -111,15 +111,15 @@ TestCase {
         compare(control.down, false)
 
         // release outside
-        mousePress(control, control.width / 2, control.height / 2, Qt.LeftToolButton)
+        mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(pressedSpy.count, 5)
         compare(downSpy.count, 5)
         compare(control.pressed, true)
         compare(control.down, true)
-        mouseMove(control, control.width * 2, control.height * 2, 0)
+        mouseMove(control, control.width * 2, control.height * 2)
         compare(control.pressed, false)
         compare(control.down, false)
-        mouseRelease(control, control.width * 2, control.height * 2, Qt.LeftToolButton)
+        mouseRelease(control, control.width * 2, control.height * 2, Qt.LeftButton)
         compare(clickedSpy.count, 2)
         compare(pressedSpy.count, 6)
         compare(downSpy.count, 6)