Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1

Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index 7bfa17c5..80155f69 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -865,4 +865,20 @@ TestCase {
         compare(button3.checked, false)
         compare(button3.action.checked, false)
     }
+
+    function test_clickedAfterLongPress() {
+        var control = createTemporaryObject(button, testCase, { text: "Hello" })
+        verify(control)
+
+        var clickedSpy = signalSpy.createObject(control, { target: control, signalName: "clicked" })
+        verify(clickedSpy.valid)
+
+        mousePress(control)
+        // Ensure that clicked is emitted when no handler is defined for the pressAndHold() signal.
+        // Note that even though signal spies aren't considered in QObject::isSignalConnected(),
+        // we can't use one here to check for pressAndHold(), because otherwise clicked() won't be emitted.
+        wait(Qt.styleHints.mousePressAndHoldInterval + 100)
+        mouseRelease(control)
+        compare(clickedSpy.count, 1)
+    }
 }