diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /tests/auto/quick/qmltests | |
parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_viewSource.qml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml index d0bc0529d..b21d72eb2 100644 --- a/tests/auto/quick/qmltests/data/tst_viewSource.qml +++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml @@ -63,8 +63,10 @@ TestWebEngineView { name: "WebEngineViewSource" function init() { + webEngineView.loadStatus = null; webEngineView.url = Qt.resolvedUrl("test1.html"); - verify(webEngineView.waitForLoadSucceeded(20000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadSucceededStatus); + webEngineView.loadStatus = null; newViewRequestedSpy.clear(); titleChangedSpy.clear(); @@ -113,9 +115,9 @@ TestWebEngineView { webEngineView.url = row.userInputUrl; if (row.loadSucceed) { - verify(webEngineView.waitForLoadSucceeded(15000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadSucceededStatus); } else { - verify(webEngineView.waitForLoadFailed(15000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadFailedStatus, 15000); } tryVerify(function() { return titleChangedSpy.count == 1; }); |