diff options
author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-02-26 08:19:42 -0800 |
---|---|---|
committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-02-27 09:35:41 +0000 |
commit | 26ae2ce0a8401698a2b1c1f0a8162ebf83dcafef (patch) | |
tree | e4e7f0832a72c8dc91d0ef0eec84303d5f70a46c /tests | |
parent | a0b9e663d3a204bbaee2f6150c8b0511d396a295 (diff) |
Update tst_navigationHistory QML test
This API is not experimental anymore.
Change-Id: Ide416705f7d9e148133f155f915e8db79fee8e12
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_navigationHistory.qml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml index 335d9155e..ea56cc29e 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml @@ -42,7 +42,6 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.1 -import QtWebEngine.experimental 1.0 TestWebEngineView { id: webEngineView @@ -52,7 +51,7 @@ TestWebEngineView { ListView { id: backItemsList anchors.fill: parent - model: webEngineView.experimental.navigationHistory.backItems + model: webEngineView.navigationHistory.backItems currentIndex: count - 1 delegate: Text { @@ -64,7 +63,7 @@ TestWebEngineView { ListView { id: forwardItemsList anchors.fill: parent - model: webEngineView.experimental.navigationHistory.forwardItems + model: webEngineView.navigationHistory.forwardItems currentIndex: 0 delegate: Text { @@ -94,7 +93,7 @@ TestWebEngineView { compare(backItemsList.count, 1) compare(backItemsList.currentItem.text, Qt.resolvedUrl("test1.html")) - webEngineView.experimental.goBackTo(0) + webEngineView.goBackOrForward(-1) verify(webEngineView.waitForLoadSucceeded()) compare(webEngineView.url, Qt.resolvedUrl("test1.html")) compare(webEngineView.canGoBack, false) @@ -121,7 +120,7 @@ TestWebEngineView { compare(forwardItemsList.count, 0) compare(backItemsList.currentItem.text, Qt.resolvedUrl("test1.html")) - webEngineView.experimental.goBackTo(1) + webEngineView.goBackOrForward(-2) verify(webEngineView.waitForLoadSucceeded()) compare(webEngineView.url, Qt.resolvedUrl("test1.html")) compare(webEngineView.canGoBack, false) @@ -130,7 +129,7 @@ TestWebEngineView { compare(forwardItemsList.count, 2) compare(forwardItemsList.currentItem.text, Qt.resolvedUrl("test2.html")) - webEngineView.experimental.goForwardTo(1) + webEngineView.goBackOrForward(2) verify(webEngineView.waitForLoadSucceeded()) compare(webEngineView.url, Qt.resolvedUrl("javascript.html")) compare(webEngineView.canGoBack, true) |