diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-19 07:58:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-19 09:01:43 +0200 |
| commit | 124dd9adb5882048e44dcd012e08899d4e480196 (patch) | |
| tree | f6022e22f08f2128df2b0cc2081c2b8843408aba /tests/auto/controls/data/tst_control.qml | |
| parent | 6cb2367f01c1f78d760c1a4d70002cf5a5046396 (diff) | |
| parent | d6fbb1239950f392f3d569da7dde226e865b7bcd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
src/imports/controls/material/qquickmaterialstyle.cpp
Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
Diffstat (limited to 'tests/auto/controls/data/tst_control.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_control.qml | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index f07f6051..1b60eb73 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -847,8 +847,15 @@ TestCase { compare(control.mirroredspy_5.count, 1) } - function test_hover() { - var control = component.createObject(testCase, {width: 100, height: 100}) + function test_hover_data() { + return [ + { tag: "normal", target: component, pressed: false }, + { tag: "pressed", target: button, pressed: true } + ] + } + + function test_hover(data) { + var control = data.target.createObject(testCase, {width: 100, height: 100}) verify(control) compare(control.hovered, false) @@ -864,9 +871,19 @@ TestCase { mouseMove(control, control.width / 2, control.height / 2) compare(control.hovered, true) + if (data.pressed) { + mousePress(control, control.width / 2, control.height / 2) + compare(control.hovered, true) + } + mouseMove(control, -10, -10) compare(control.hovered, false) + if (data.pressed) { + mouseRelease(control, -10, control.height / 2) + compare(control.hovered, false) + } + mouseMove(control, control.width / 2, control.height / 2) compare(control.hovered, true) |