AbstractButton: emit doubleClicked() for touch events

[ChangeLog][Controls][AbstractButton] doubleClicked() is now also
emitted for touch events.

Fixes: QTBUG-82146
Change-Id: Ie1e24d291bd4b592edd91fc762da8636e08698df
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 55 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index f2242feb..72e56270 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -909,6 +909,35 @@ TestCase {
         compare(releasedSpy.count, 2)
         compare(clickedSpy.count, 1)
         compare(doubleClickedSpy.count, 1)
+
+        let touch = touchEvent(control)
+        touch.press(0, control)
+        touch.commit()
+        compare(pressedSpy.count, 3)
+        compare(releasedSpy.count, 2)
+        compare(clickedSpy.count, 1)
+        compare(doubleClickedSpy.count, 1)
+
+        touch.release(0, control)
+        touch.commit()
+        compare(pressedSpy.count, 3)
+        compare(releasedSpy.count, 3)
+        compare(clickedSpy.count, 2)
+        compare(doubleClickedSpy.count, 1)
+
+        touch.press(0, control)
+        touch.commit()
+        compare(pressedSpy.count, 4)
+        compare(releasedSpy.count, 3)
+        compare(clickedSpy.count, 2)
+        compare(doubleClickedSpy.count, 1)
+
+        touch.release(0, control)
+        touch.commit()
+        compare(pressedSpy.count, 4)
+        compare(releasedSpy.count, 4)
+        compare(clickedSpy.count, 2)
+        compare(doubleClickedSpy.count, 2)
     }
 
     function test_checkedShouldNotSetCheckable() {
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 81c3d6ca..be68ac0d 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -236,6 +236,8 @@ TestCase {
         // uncheck
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.Checked }],
                                         "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
@@ -254,6 +256,7 @@ TestCase {
         // release outside
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }],
                                         "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml
index 731caf86..0e8d188d 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/controls/data/tst_delaybutton.qml
@@ -203,6 +203,8 @@ TestCase {
                                         ["downChanged", { "down": true }],
                                         "pressed",
                                         "activated"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         tryVerify(function() { return sequenceSpy.success})
@@ -220,6 +222,7 @@ TestCase {
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }],
                                         ["downChanged", { "down": true }],
                                         "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
@@ -237,6 +240,7 @@ TestCase {
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }],
                                         ["downChanged", { "down": true }],
                                         "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 42ef9a15..973e56a3 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -193,6 +193,8 @@ TestCase {
         // attempt uncheck
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                         "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
@@ -207,6 +209,7 @@ TestCase {
         // release outside
         sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                         "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(sequenceSpy.success)
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 9050964f..175cd741 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -249,6 +249,8 @@ TestCase {
         // uncheck
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -265,6 +267,7 @@ TestCase {
         // release on the right
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -283,6 +286,7 @@ TestCase {
         // release on the left
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -301,6 +305,7 @@ TestCase {
         // release in the middle
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, 0, 0).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -460,6 +465,8 @@ TestCase {
         // press-drag-release outside the indicator
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, 0).commit()
         compare(control.position, 1.0)
         compare(control.checked, true)
@@ -495,6 +502,7 @@ TestCase {
         // press-drag-release from and to outside the indicator
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width).commit()
         compare(control.position, 0.0)
         compare(control.checked, false)
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index fabd6279..f7f0ead4 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -245,6 +245,8 @@ TestCase {
         // uncheck
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -261,6 +263,7 @@ TestCase {
         // release on the right
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -279,6 +282,7 @@ TestCase {
         // release on the left
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width / 2, control.height / 2).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -297,6 +301,7 @@ TestCase {
         // release in the middle
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, 0, 0).commit()
         compare(control.pressed, true)
         verify(spy.success)
@@ -456,6 +461,8 @@ TestCase {
         // press-drag-release outside the indicator
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                 "pressed"]
+        // Don't want to double-click.
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, 0).commit()
         compare(control.position, 1.0)
         compare(control.checked, true)
@@ -491,6 +498,7 @@ TestCase {
         // press-drag-release from and to outside the indicator
         spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                 "pressed"]
+        wait(Qt.styleHints.mouseDoubleClickInterval + 50)
         touch.press(0, control, control.width).commit()
         compare(control.position, 0.0)
         compare(control.checked, false)