diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:57:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:57:38 +0200 |
| commit | 7e609f6d109f8bebb7e2fe4bd8867c5a4f8ece3d (patch) | |
| tree | ecbd4f56e83a84233d42928e5554709ca8832ce1 /tests/auto/qmltest | |
| parent | 78f5b9e7f7295b9ba11da6908713fb938a1e0b90 (diff) | |
| parent | c0f3c8ae5cee3ecda1ac8829336aa95cbe4d330e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4ssa_p.h
src/qml/qml/qqmlobjectcreator.cpp
Change-Id: I8bb7fe773d657f908f20ee5e72c2b9bd643f6260
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/listview/tst_listview.qml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml index 98d7ea4cb7..65f736f305 100644 --- a/tests/auto/qmltest/listview/tst_listview.qml +++ b/tests/auto/qmltest/listview/tst_listview.qml @@ -320,9 +320,13 @@ Item { function test_listInteractiveCurrentIndexEnforce() { mousePress(listInteractiveCurrentIndexEnforce, 10, 50); + wait(1); // because Flickable pays attention to velocity, we need some time between movements mouseMove(listInteractiveCurrentIndexEnforce, 10, 40); + wait(1); mouseMove(listInteractiveCurrentIndexEnforce, 10, 30); + wait(1); mouseMove(listInteractiveCurrentIndexEnforce, 10, 20); + wait(1); mouseMove(listInteractiveCurrentIndexEnforce, 10, 10); compare(listInteractiveCurrentIndexEnforce.interactive, false); mouseRelease(listInteractiveCurrentIndexEnforce, 10, 10); |