diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-10 13:37:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-10 13:37:32 +0200 |
| commit | 39ad918e4c9e0c5460629f878e292491678d41a6 (patch) | |
| tree | 1a33d4c02410ac56704c6cfdddb9a87b36f4392e /tests | |
| parent | 37b714d3e09f839553e9d4a151b44b647e39c548 (diff) | |
| parent | e93c73c0aa15cd973e008a04a70a7c69719ad244 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/imports/controls/material/BoxShadow.qml
Change-Id: I52c9f70dec9e56e2374d3ec0c135f2963cf5e833
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_tumbler.qml | 1 |
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) } } |