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

 Conflicts:
	src/imports/controls/qtquickcontrols2plugin.cpp

Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index ee26a6d6..da5642cc 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -887,4 +887,27 @@ TestCase {
         mouseRelease(control)
         compare(clickedSpy.count, 1)
     }
+
+    function test_doubleClick() {
+        let control = createTemporaryObject(button, testCase, { text: "Hello" })
+        verify(control)
+
+        let pressedSpy = signalSpy.createObject(control, { target: control, signalName: "pressed" })
+        verify(pressedSpy.valid)
+
+        let releasedSpy = signalSpy.createObject(control, { target: control, signalName: "released" })
+        verify(releasedSpy.valid)
+
+        let clickedSpy = signalSpy.createObject(control, { target: control, signalName: "clicked" })
+        verify(clickedSpy.valid)
+
+        let doubleClickedSpy = signalSpy.createObject(control, { target: control, signalName: "doubleClicked" })
+        verify(doubleClickedSpy.valid)
+
+        mouseDoubleClickSequence(control)
+        compare(pressedSpy.count, 2)
+        compare(releasedSpy.count, 2)
+        compare(clickedSpy.count, 1)
+        compare(doubleClickedSpy.count, 1)
+    }
 }