From 6b35497375c07c49cca7317a4452acc6adc7a1cd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 1 Feb 2018 12:19:37 +0100 Subject: Basic adaptations for 65-based MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning --- tests/auto/quick/qmltests/data/tst_viewSource.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qmltests') 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; }); -- cgit v1.2.3