diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:23:53 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:24:28 +0100 |
| commit | 3f3e82fb05eb9eb9e03ccf8ed7de987b91e698ee (patch) | |
| tree | 484247f63e601abd8b012b86e6cde6ff56710cbb /tests/auto/controls/data/tst_delaybutton.qml | |
| parent | c3ff6b78ba8e0978bc408f6e3e490bcd32f6cfb0 (diff) | |
| parent | 6cdd4b53031de17b36b30b00de0a6945470a35ad (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27
Diffstat (limited to 'tests/auto/controls/data/tst_delaybutton.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_delaybutton.qml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml index 2560177d..e965b5ef 100644 --- a/tests/auto/controls/data/tst_delaybutton.qml +++ b/tests/auto/controls/data/tst_delaybutton.qml @@ -173,8 +173,7 @@ TestCase { "doubleClicked", ["pressedChanged", { "pressed": false }], ["downChanged", { "down": false }], - "released", - "clicked"] + "released"] mouseDoubleClickSequence(control, control.width / 2, control.height / 2, Qt.LeftButton) verify(sequenceSpy.success) } |