tst_control: fix TestCase::mouseMove() usage

TestCase::mouseMove() does not take a mouse button argument. What we
intended to pass as a button argument, was actually used as a 1ms delay
(the value of Qt.LeftButton is 1).

Change-Id: I5e6e6b05a521702e99418cceba2d0a7cdbc68109
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

13 files changed, 57 insertions, 57 deletions

diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 450a4f20..ea1dda0b 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -110,7 +110,7 @@ TestCase {
 
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }],
                                         ["downChanged", { "down": false }]]
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(control.pressed, false)
         verify(sequenceSpy.success)
 
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 2ed29aec..eb052e12 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -175,7 +175,7 @@ TestCase {
         compare(control.pressed, true)
         verify(sequenceSpy.success)
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(control.pressed, false)
         verify(sequenceSpy.success)
         sequenceSpy.expectedSequence = [["canceled", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml
index d5c9bd0c..722c676c 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/controls/data/tst_delaybutton.qml
@@ -131,7 +131,7 @@ TestCase {
 
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }],
                                         ["downChanged", { "down": false }]]
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(control.pressed, false)
         verify(sequenceSpy.success)
 
diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml
index 46b339e1..0281b8bc 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/controls/data/tst_dial.qml
@@ -252,9 +252,9 @@ TestCase {
         var yPos = dial.height * 0.75;
         mousePress(dial, dial.width * 0.25, yPos, Qt.LeftButton);
         var positionAtPress = dial.position;
-        mouseMove(dial, dial.width * 0.5, yPos, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.5, yPos);
         compare(dial.position, positionAtPress);
-        mouseMove(dial, dial.width * 0.75, yPos, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.75, yPos);
         compare(dial.position, positionAtPress);
         mouseRelease(dial, dial.width * 0.75, yPos, Qt.LeftButton);
         compare(dial.position, positionAtPress);
@@ -263,9 +263,9 @@ TestCase {
         yPos = dial.height * 0.6;
         mousePress(dial, dial.width * 0.25, yPos, Qt.LeftButton);
         positionAtPress = dial.position;
-        mouseMove(dial, dial.width * 0.5, yPos, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.5, yPos);
         compare(dial.position, positionAtPress);
-        mouseMove(dial, dial.width * 0.75, yPos, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.75, yPos);
         compare(dial.position, positionAtPress);
         mouseRelease(dial, dial.width * 0.75, yPos, Qt.LeftButton);
         compare(dial.position, positionAtPress);
@@ -273,9 +273,9 @@ TestCase {
         // Going from below the center of the dial to above it should work (once it gets above the center).
         mousePress(dial, dial.width * 0.25, dial.height * 0.75, Qt.LeftButton);
         positionAtPress = dial.position;
-        mouseMove(dial, dial.width * 0.5, dial.height * 0.6, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.5, dial.height * 0.6);
         compare(dial.position, positionAtPress);
-        mouseMove(dial, dial.width * 0.75, dial.height * 0.4, Qt.LeftButton);
+        mouseMove(dial, dial.width * 0.75, dial.height * 0.4);
         verify(dial.position > positionAtPress);
         mouseRelease(dial, dial.width * 0.75, dial.height * 0.3, Qt.LeftButton);
         verify(dial.position > positionAtPress);
diff --git a/tests/auto/controls/data/tst_drawer.qml b/tests/auto/controls/data/tst_drawer.qml
index 7eb8a9a5..db7b3750 100644
--- a/tests/auto/controls/data/tst_drawer.qml
+++ b/tests/auto/controls/data/tst_drawer.qml
@@ -89,7 +89,7 @@ TestCase {
             skip("This test requires a startDragDistance that is less than the opening threshold of the drawer")
 
         mousePress(control, 0, 0, Qt.LeftButton)
-        mouseMove(control, distance, 0, Qt.LeftButton)
+        mouseMove(control, distance, 0)
         verify(control.position > 0)
         tryCompare(control, "position", distance / control.contentItem.width)
         mouseRelease(control, distance, 0, Qt.LeftButton)
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 9011490e..e9f1d82c 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -137,7 +137,7 @@ TestCase {
         compare(control.pressed, true)
         verify(sequenceSpy.success)
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }]]
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(control.pressed, false)
         sequenceSpy.expectedSequence = [["canceled", { "pressed": false, "checked": true }]]
         mouseRelease(control, control.width * 2, control.height * 2, Qt.LeftButton)
diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml
index b015b2de..baf4333f 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/controls/data/tst_rangeslider.qml
@@ -350,7 +350,7 @@ TestCase {
         var horizontal = control.orientation === Qt.Horizontal
         var toX = horizontal ? control.width * 0.5 : control.first.handle.x
         var toY = horizontal ? control.first.handle.y : control.height * 0.5
-        mouseMove(control, toX, toY, Qt.LeftButton)
+        mouseMove(control, toX, toY)
         compare(firstPressedSpy.count, 5)
         compare(secondPressedSpy.count, 2)
         compare(control.first.pressed, true)
@@ -571,7 +571,7 @@ TestCase {
         compare(control.first.handle.z, 0)
 
         // Move the second handle out of the way.
-        mouseMove(control, control.width, control.first.handle.y, Qt.LeftButton)
+        mouseMove(control, control.width, control.first.handle.y)
         mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
         verify(!control.second.pressed)
         compare(control.second.value, 1.0)
@@ -584,7 +584,7 @@ TestCase {
         compare(control.first.handle.z, 1)
         compare(control.second.handle.z, 0)
 
-        mouseMove(control, control.width, control.first.handle.y, Qt.LeftButton)
+        mouseMove(control, control.width, control.first.handle.y)
         mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
         verify(!control.first.pressed)
         compare(control.first.handle.z, 1)
@@ -703,14 +703,14 @@ TestCase {
         compare(control.first.position, 0.0)
         compare(control.first.visualPosition, 0.0)
 
-        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0)
         compare(firstPressedSpy.count, 1)
         compare(control.first.pressed, true)
         compare(control.first.value, 0.0)
         compare(control.first.position, 0.5)
         compare(control.first.visualPosition, 0.5)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(firstPressedSpy.count, 1)
         compare(control.first.pressed, true)
         compare(control.first.value, 0.0)
@@ -735,14 +735,14 @@ TestCase {
         compare(control.first.position, 0.0)
         compare(control.first.visualPosition, 1.0)
 
-        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0)
         compare(firstPressedSpy.count, 3)
         compare(control.first.pressed, true)
         compare(control.first.value, 0.0)
         compare(control.first.position, 0.5)
         compare(control.first.visualPosition, 0.5)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(firstPressedSpy.count, 3)
         compare(control.first.pressed, true)
         compare(control.first.value, 0.0)
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index 8727b6da..840f187f 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -191,12 +191,12 @@ TestCase {
         compare(control.pressed, true)
         compare(control.position, 0.0)
 
-        mouseMove(control, -control.width, -control.height, 0, Qt.LeftButton)
+        mouseMove(control, -control.width, -control.height, 0)
         compare(pressedSpy.count, 1)
         compare(control.pressed, true)
         compare(control.position, 0.0)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, 1)
         compare(control.pressed, true)
         verify(control.position, 0.5)
@@ -211,12 +211,12 @@ TestCase {
         compare(control.pressed, true)
         compare(control.position, 0.5)
 
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(pressedSpy.count, 3)
         compare(control.pressed, true)
         compare(control.position, 1.0)
 
-        mouseMove(control, control.width * 0.75, control.height * 0.75, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.75, control.height * 0.75, 0)
         compare(pressedSpy.count, 3)
         compare(control.pressed, true)
         compare(control.position, 0.75)
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 1dec038e..8a3499be 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -227,14 +227,14 @@ TestCase {
         compare(control.position, 0.0)
 
         // mininum on the left in horizontal vs. at the bottom in vertical
-        mouseMove(control, -control.width, 2 * control.height, 0, Qt.LeftButton)
+        mouseMove(control, -control.width, 2 * control.height, 0)
         compare(pressedSpy.count, pressedCount)
         compare(movedSpy.count, movedCount)
         compare(control.pressed, true)
         compare(control.value, 0.0)
         compare(control.position, 0.0)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, pressedCount)
         compare(movedSpy.count, ++movedCount)
         compare(control.pressed, true)
@@ -256,14 +256,14 @@ TestCase {
         compare(control.position, 0.5)
 
         // maximum on the right in horizontal vs. at the top in vertical
-        mouseMove(control, control.width * 2, -control.height, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, -control.height, 0)
         compare(pressedSpy.count, pressedCount)
         compare(movedSpy.count, ++movedCount)
         compare(control.pressed, true)
         compare(control.value, data.live ? 1.0 : 0.5)
         compare(control.position, 1.0)
 
-        mouseMove(control, control.width * 0.75, control.height * 0.25, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.75, control.height * 0.25, 0)
         compare(pressedSpy.count, pressedCount)
         compare(movedSpy.count, ++movedCount)
         compare(control.pressed, true)
@@ -578,14 +578,14 @@ TestCase {
         compare(control.position, 0.0)
         compare(control.visualPosition, 0.0)
 
-        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, 1)
         compare(control.pressed, true)
         compare(control.value, 0.0)
         compare(control.position, 0.5)
         compare(control.visualPosition, 0.5)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, 1)
         compare(control.pressed, true)
         compare(control.value, 0.0)
@@ -610,14 +610,14 @@ TestCase {
         compare(control.position, 0.0)
         compare(control.visualPosition, 1.0)
 
-        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.leftPadding + control.availableWidth * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, 3)
         compare(control.pressed, true)
         compare(control.value, 0.0)
         compare(control.position, 0.5)
         compare(control.visualPosition, 0.5)
 
-        mouseMove(control, control.width * 0.5, control.height * 0.5, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 0.5, control.height * 0.5, 0)
         compare(pressedSpy.count, 3)
         compare(control.pressed, true)
         compare(control.value, 0.0)
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index a36a2770..edccf812 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -184,7 +184,7 @@ TestCase {
         var distance = (to - from) * control.width;
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + distance, control.height / 2);
         mouseRelease(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton);
         compare(control.swipe.position, to);
 
@@ -850,7 +850,7 @@ TestCase {
         verify(control);
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width, control.height / 2);
         verify(control.swipe.leftItem);
         compare(control.swipe.leftItem.x, -control.width / 2);
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton);
@@ -862,11 +862,11 @@ TestCase {
 
         // Should be limited within the range -1.0 to 1.0.
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width * 1.5, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width * 1.5, control.height / 2);
         compare(control.swipe.position, 1.0);
-        mouseMove(control, control.width * 1.6, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width * 1.6, control.height / 2);
         compare(control.swipe.position, 1.0);
-        mouseMove(control, control.width * -1.6, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width * -1.6, control.height / 2);
         compare(control.swipe.position, -1.0);
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton);
     }
@@ -901,20 +901,20 @@ TestCase {
         // Ensure that the position is scaled to the width of the currently visible delegate.
         var overDragDistance = Math.round(dragDistance * 1.1);
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 + overDragDistance, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + overDragDistance, control.height / 2);
         verify(control.swipe.leftItem);
         compare(control.swipe.position, overDragDistance / control.swipe.leftItem.width);
 
-        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2);
         compare(control.swipe.position, 1.0);
 
         // Ensure that it's not possible to drag past the (left) delegate.
-        mouseMove(control, control.width / 2 + control.swipe.leftItem.width + 1, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width + 1, control.height / 2);
         compare(control.swipe.position, 1.0);
 
         // Now release over the right side; the position should be 1.0 and the background
         // should be "anchored" to the right side of the left delegate item.
-        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2);
         mouseRelease(control, control.width / 2 + control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
         compare(control.swipe.position, 1.0);
         tryCompare(control.background, "x", control.swipe.leftItem.width, 1000);
@@ -936,13 +936,13 @@ TestCase {
 
         // Ensure that both delegates are constructed.
         mousePress(control, 0, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width * 1.1, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width * 1.1, control.height / 2);
         verify(control.swipe.leftItem);
-        mouseMove(control, control.width * -0.1, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width * -0.1, control.height / 2);
         verify(control.swipe.rightItem);
 
         // Expose the left delegate.
-        mouseMove(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.swipe.leftItem.width, control.height / 2);
         mouseRelease(control, control.swipe.leftItem.width, control.height / 2);
         verify(control.swipe.complete);
         compare(control.swipe.position, 1.0);
@@ -957,21 +957,21 @@ TestCase {
         compare(leftVisibleSpy.count, 0);
         compare(rightVisibleSpy.count, 0);
         var newX = control.swipe.leftItem.width - Math.round(dragDistance * 1.1);
-        mouseMove(control, newX, control.height / 2, Qt.LeftButton, Qt.LeftButton);
+        mouseMove(control, newX, control.height / 2);
         compare(leftVisibleSpy.count, 0);
         compare(rightVisibleSpy.count, 0);
         compare(control.swipe.position, newX / control.swipe.leftItem.width);
 
-        mouseMove(control, 0, control.height / 2, Qt.LeftButton);
+        mouseMove(control, 0, control.height / 2);
         compare(control.swipe.position, 0);
 
         // Test swiping over a distance that is greater than the width of the left item.
-        mouseMove(control, -1, control.height / 2, Qt.LeftButton);
+        mouseMove(control, -1, control.height / 2);
         verify(control.swipe.rightItem);
         compare(control.swipe.position, -1 / control.swipe.rightItem.width);
 
         // Now go back to 1.0.
-        mouseMove(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.swipe.leftItem.width, control.height / 2);
         compare(control.swipe.position, 1.0);
         tryCompare(control.background, "x", control.swipe.leftItem.width, 1000);
         mouseRelease(control, control.swipe.leftItem.width, control.height / 2, Qt.LeftButton);
@@ -1042,7 +1042,7 @@ TestCase {
 
         // Should be possible to "wrap" with a behind delegate specified.
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 + control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 + control.swipe.behindItem.width * 0.8, control.height / 2);
         compare(control.swipe.position, -0.2);
         mouseRelease(control, control.width / 2 + control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
         tryCompare(control.swipe, "position", 0.0);
@@ -1053,7 +1053,7 @@ TestCase {
         compare(control.swipe.behindItem.x, control.background.x + control.background.width);
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2 - control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width / 2 - control.swipe.behindItem.width * 0.8, control.height / 2);
         compare(control.swipe.position, 0.2);
         mouseRelease(control, control.width / 2 - control.swipe.behindItem.width * 0.8, control.height / 2, Qt.LeftButton);
         tryCompare(control.swipe, "position", 0.0);
@@ -1275,7 +1275,7 @@ TestCase {
         mouseSignalSequenceSpy.target = control;
         mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed", ["pressedChanged", { "pressed": false }]];
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width / 2, control.height + 10, Qt.LeftButton);
+        mouseMove(control, control.width / 2, control.height + 10);
         verify(mouseSignalSequenceSpy.success);
 
         mouseSignalSequenceSpy.expectedSequence = ["canceled"];
@@ -1289,7 +1289,7 @@ TestCase {
             ? [["pressedChanged", { "pressed": true }], "pressed"]
             : [["pressedChanged", { "pressed": true }], "pressed", ["pressedChanged", { "pressed": false }]];
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width + 10, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width + 10, control.height / 2);
         if (hasDelegates)
             verify(control.swipe.position > 0);
         verify(mouseSignalSequenceSpy.success);
@@ -1365,7 +1365,7 @@ TestCase {
         var rightLabel = control.swipe.rightItem.label;
         var overDragDistance = Math.round(dragDistance * 1.1);
         mousePress(rightLabel, rightLabel.width / 2, rightLabel.height / 2, Qt.rightButton);
-        mouseMove(rightLabel, rightLabel.width / 2 - overDragDistance, rightLabel.height / 2, Qt.LeftButton);
+        mouseMove(rightLabel, rightLabel.width / 2 - overDragDistance, rightLabel.height / 2);
         verify(!control.swipe.leftItem);
 
         mouseRelease(rightLabel, rightLabel.width / 2 - overDragDistance, control.height / 2, Qt.LeftButton);
@@ -1549,7 +1549,7 @@ TestCase {
         verify(control);
 
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        mouseMove(control, control.width - 1, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width - 1, control.height / 2);
         verify(control.down);
         verify(!control.behavior.enabled);
         verify(!control.animation.running);
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index cf05b704..2b050d14 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -155,7 +155,7 @@ TestCase {
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
         verify(spy.success)
-        mouseMove(control, control.width * 2, control.height / 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height / 2, 0)
         compare(control.pressed, true)
         spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
                                 ["checkedChanged", { "pressed": false, "checked": true }],
@@ -173,7 +173,7 @@ TestCase {
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
         verify(spy.success)
-        mouseMove(control, -control.width, control.height / 2, 0, Qt.LeftButton)
+        mouseMove(control, -control.width, control.height / 2, 0)
         compare(control.pressed, true)
         spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }],
                                 ["checkedChanged", { "pressed": false, "checked": false }],
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index ccb2da57..3f591602 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -151,7 +151,7 @@ TestCase {
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
         verify(spy.success)
-        mouseMove(control, control.width * 2, control.height / 2, 0, Qt.LeftButton)
+        mouseMove(control, control.width * 2, control.height / 2, 0)
         compare(control.pressed, true)
         spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
                                 ["checkedChanged", { "pressed": false, "checked": true }],
@@ -169,7 +169,7 @@ TestCase {
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
         verify(spy.success)
-        mouseMove(control, -control.width, control.height / 2, 0, Qt.LeftButton)
+        mouseMove(control, -control.width, control.height / 2, 0)
         compare(control.pressed, true)
         spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }],
                                 ["checkedChanged", { "pressed": false, "checked": false }],
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index e59893d0..88afeeb3 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -116,7 +116,7 @@ TestCase {
         compare(downSpy.count, 5)
         compare(control.pressed, true)
         compare(control.down, true)
-        mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftToolButton)
+        mouseMove(control, control.width * 2, control.height * 2, 0)
         compare(control.pressed, false)
         compare(control.down, false)
         mouseRelease(control, control.width * 2, control.height * 2, Qt.LeftToolButton)