diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 03:00:30 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-17 09:45:48 +0000 |
| commit | d96bd6069c6d24c12f0a3d96466e50b4d1a09ac4 (patch) | |
| tree | b1250acd86c482fc92cd90d1733f0a436d1c2a78 /tests/auto/controls/data/tst_tumbler.qml | |
| parent | 1567e4581e1f82dae011d6d3b2e4196efc93b0f4 (diff) | |
| parent | 449c9c2474da0461c14e7d6ea12ff4e35c3c7aae (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickscrollview.cpp
tests/auto/qquickstyle/tst_qquickstyle.cpp
Change-Id: I9afddf07a956f43cf0445e91b8d1a02f167b6bd5
Diffstat (limited to 'tests/auto/controls/data/tst_tumbler.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_tumbler.qml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index f62c62c2..18f63ed4 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -298,13 +298,7 @@ TestCase { tryCompare(tumbler, "currentIndex", data.currentIndex); tumblerView = findView(tumbler); - // TODO: replace once QTBUG-19708 is fixed. - for (var delay = 1000; delay >= 0; delay -= 50) { - if (tumblerView.currentItem) - break; - wait(50); - } - verify(tumblerView.currentItem); + tryVerify(function() { return tumblerView.currentItem }); compare(tumblerView.currentIndex, data.currentIndex); compare(tumblerView.currentItem.text, data.currentIndex.toString()); |