diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 00:41:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 00:41:58 +0200 |
| commit | d54d28981c90d23d7fa0cfc5a9e3049e3e4df6b5 (patch) | |
| tree | 0eb2f54f16b014f6eaa362095393d1bd058adb52 /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | |
| parent | 580f2872f09cf7ad83ec9ae5dca686683a3cac80 (diff) | |
| parent | 6f15de1d2da9c83d7fca1d5c8243c0d69a1390ee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4ssa_p.h
tests/benchmarks/qml/qqmlimage/qqmlimage.pro
tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
Change-Id: Iad11ce7fdf0c6d200fdebc16a94081bd8069a87a
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 96fe97f372..4a0b8a8bdf 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -1461,6 +1461,7 @@ void tst_qquickflickable::flickWithTouch(QQuickWindow *window, QTouchDevice *tou for (int i = 1; i <= 8; ++i) { QTest::touchEvent(window, touchDevice).move(0, from + i*diff/8, window); QQuickTouchUtils::flush(window); + QTest::qWait(1); // because Flickable pays attention to velocity, we need some time between movements } QTest::touchEvent(window, touchDevice).release(0, to, window); QQuickTouchUtils::flush(window); |