Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/auto/qmltest/events/tst_events.qml b/tests/auto/qmltest/events/tst_events.qml
index b9bc78be21..8a08d7dd2b 100644
--- a/tests/auto/qmltest/events/tst_events.qml
+++ b/tests/auto/qmltest/events/tst_events.qml
@@ -53,10 +53,28 @@ Rectangle {
 
     property bool mouseHasBeenClicked: false
 
+    signal doubleClickSignalHelper(string eventType)
+
+    SignalSpy {
+        id: doubleClickSpy
+        target: top
+        signalName: "doubleClickSignalHelper"
+    }
+
     MouseArea {
         anchors.fill: parent
         onClicked: {
             mouseHasBeenClicked = true
+            doubleClickSignalHelper("clicked")
+        }
+        onPressed: {
+            doubleClickSignalHelper("pressed")
+        }
+        onReleased: {
+            doubleClickSignalHelper("released")
+        }
+        onDoubleClicked: {
+            doubleClickSignalHelper("doubleClick")
         }
     }
 
@@ -75,5 +93,22 @@ Rectangle {
             mouseClick(top, 25, 30)
             tryCompare(top, "mouseHasBeenClicked", true, 10000)
         }
+
+        function test_mouse_doubleclick() {
+            doubleClickSpy.clear()
+            mouseDoubleClickSequence(top, 25, 30)
+            compare(doubleClickSpy.count, 6)
+            compare(doubleClickSpy.signalArguments[0][0], "pressed")
+            compare(doubleClickSpy.signalArguments[1][0], "released")
+            compare(doubleClickSpy.signalArguments[2][0], "clicked")
+            compare(doubleClickSpy.signalArguments[3][0], "pressed")
+            compare(doubleClickSpy.signalArguments[4][0], "doubleClick")
+            compare(doubleClickSpy.signalArguments[5][0], "released")
+
+            doubleClickSpy.clear()
+            mouseDoubleClick(top, 25, 30)
+            compare(doubleClickSpy.count, 1)
+            compare(doubleClickSpy.signalArguments[0][0], "doubleClick")
+        }
     }
 }