diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 10:45:14 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 10:45:14 +0200 |
| commit | 3ca5f33c8b9c273f0169ec4c11417328f8071e97 (patch) | |
| tree | 155da80482fb4593ca074f7a1bf9b22d031dba4a /tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | |
| parent | 5f4698c4e7952d64e78e3a06de5ac28d68415b19 (diff) | |
| parent | b7a1bcd83a8f68185b617b860cef6f2d2d7c8d9b (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430
Diffstat (limited to 'tests/auto/quick/qquickpathview/tst_qquickpathview.cpp')
| -rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 5f7f35b5d7..4211d08393 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -2462,9 +2462,11 @@ static void verify_offsets(QQuickPathView *pathview, int toidx, qreal fromoffset QTest::qWait(100); first = pathview->offset(); while (1) { + if (first == 0) + first = pathview->offset(); QTest::qWait(10); // highlightMoveDuration: 1000 second = pathview->offset(); - if (!started && second != first) { // animation started + if (!started && first != 0 && second != first) { // animation started started = true; break; } |