aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-10 11:47:51 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-08-10 12:17:02 +0000
commit5b4963d52b0a1d894441d1e8e2b4308a0838a8b7 (patch)
treea533acf0e2a5d8e27d4adfc1e51b92db2d461564
parent167f38750f23d226e1b5fc18f783fe6f4d4adf3e (diff)
parent39ad918e4c9e0c5460629f878e292491678d41a6 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
-rw-r--r--tests/auto/controls/data/tst_tumbler.qml1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 2de52924..22cde065 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -405,6 +405,7 @@ TestCase {
var dragDirection = distanceToReachContentY > 0 ? -1 : 1;
for (var i = 0; i < distance && Math.floor(listView.contentY) !== Math.floor(data.contentY); ++i) {
mouseMove(tumbler, tumblerXCenter(), tumblerYCenter() + i * dragDirection);
+ wait(1); // because Flickable pays attention to velocity, we need some time between movements (qtdeclarative ebf07c3)
}
}