diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 10:36:20 +0200 |
| commit | 1a3b34ea8cfb09dcb9022e897c4b494b623abd6a (patch) | |
| tree | b18be3e29e8ce191a99641985baa371a5d504682 /tests/auto | |
| parent | 1a0e71b130f55a3ce77c6b27ac898355253f1b9a (diff) | |
| parent | 2b953bf803aa74f4c6e1e3f06b22887c1ac80961 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 28c94a6e8..b71b9dd08 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -248,9 +248,8 @@ void tst_QQuickWebEngineView::loadProgress() QSignalSpy loadProgressChangedSpy(webEngineView(), SIGNAL(loadProgressChanged())); QVERIFY(waitForLoadSucceeded(webEngineView())); - QVERIFY(loadProgressChangedSpy.count() >= 1); - - QCOMPARE(webEngineView()->loadProgress(), 100); + loadProgressChangedSpy.wait(); + QTRY_COMPARE(webEngineView()->loadProgress(), 100); } void tst_QQuickWebEngineView::show() |