diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-03 16:25:29 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-04 18:41:49 +0200 |
commit | b3909c2d860a53e85eea51e77ee40ed8adf60842 (patch) | |
tree | 2996cf4b35427d15ea185204109efbbd856f98ae /tests | |
parent | 742b9db0e34c8fc08e9f50c3053aed5f501f08d2 (diff) |
WebEngineView: rename navigationHistory to history
Match widgets API name for the same QWebEngineHistory class
[ChangeLog][QWebEngineQuick][WebEngineView] 'navigationHistory'
property is now just 'history'
Change-Id: I78507929baa84c8be08f79050568d04868171b3f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_navigationHistory.qml | 10 | ||||
-rw-r--r-- | tests/quicktestbrowser/BrowserWindow.qml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 4ea079b63..773ab12d1 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -704,6 +704,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.goBackOrForward(int) --> void" << "QQuickWebEngineView.goForward() --> void" << "QQuickWebEngineView.grantFeaturePermission(QUrl,Feature,bool) --> void" + << "QQuickWebEngineView.history --> QWebEngineHistory*" << "QQuickWebEngineView.icon --> QUrl" << "QQuickWebEngineView.iconChanged() --> void" << "QQuickWebEngineView.inspectedView --> QQuickWebEngineView*" @@ -721,7 +722,6 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loadProgressChanged() --> void" << "QQuickWebEngineView.loading --> bool" << "QQuickWebEngineView.loadingChanged(QWebEngineLoadRequest) --> void" - << "QQuickWebEngineView.navigationHistory --> QWebEngineHistory*" << "QQuickWebEngineView.navigationRequested(QWebEngineNavigationRequest*) --> void" << "QQuickWebEngineView.newViewRequested(QWebEngineNewWindowRequest*) --> void" << "QQuickWebEngineView.pdfPrintingFinished(QString,bool) --> void" diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml index 26f1fade4..d5073bef1 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml @@ -38,7 +38,7 @@ TestWebEngineView { ListView { id: backItemsList anchors.fill: parent - model: webEngineView.navigationHistory.backItems + model: webEngineView.history.backItems currentIndex: count - 1 delegate: Text { @@ -50,7 +50,7 @@ TestWebEngineView { ListView { id: forwardItemsList anchors.fill: parent - model: webEngineView.navigationHistory.forwardItems + model: webEngineView.history.forwardItems currentIndex: 0 delegate: Text { @@ -75,7 +75,7 @@ TestWebEngineView { name: "NavigationHistory" function test_navigationHistory() { - webEngineView.navigationHistory.clear() + webEngineView.history.clear() webEngineView.url = Qt.resolvedUrl("test1.html") verify(webEngineView.waitForLoadSucceeded()) @@ -147,7 +147,7 @@ TestWebEngineView { compare(backItemsList.currentItem.text, Qt.resolvedUrl("test1.html")) compare(forwardItemsList.currentItem.text, Qt.resolvedUrl("javascript.html")) - webEngineView.navigationHistory.clear() + webEngineView.history.clear() compare(webEngineView.url, Qt.resolvedUrl("test2.html")) compare(webEngineView.canGoBack, false) compare(webEngineView.canGoForward, false) @@ -156,7 +156,7 @@ TestWebEngineView { } function test_navigationButtons() { - webEngineView.navigationHistory.clear() + webEngineView.history.clear() const url1 = Qt.resolvedUrl("test1.html") webEngineView.url = url1 diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml index 6c3c160ac..2c4972366 100644 --- a/tests/quicktestbrowser/BrowserWindow.qml +++ b/tests/quicktestbrowser/BrowserWindow.qml @@ -142,7 +142,7 @@ ApplicationWindow { id: backHistoryMenu Instantiator { - model: currentWebView && currentWebView.navigationHistory.backItems + model: currentWebView && currentWebView.history.backItems MenuItem { text: model.title onTriggered: currentWebView.goBackOrForward(model.offset) @@ -157,7 +157,7 @@ ApplicationWindow { id: forwardHistoryMenu Instantiator { - model: currentWebView && currentWebView.navigationHistory.forwardItems + model: currentWebView && currentWebView.history.forwardItems MenuItem { text: model.title onTriggered: currentWebView.goBackOrForward(model.offset) |