diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 9 | ||||
| -rw-r--r-- | tests/quicktestbrowser/BrowserWindow.qml | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 42c58bf14..605eaa041 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -48,6 +48,7 @@ #include <private/qquickwebengineview_p.h> #include <private/qquickwebenginecertificateerror_p.h> #include <private/qquickwebenginedownloaditem_p.h> +#include <private/qquickwebenginehistory_p.h> #include <private/qquickwebengineloadrequest_p.h> #include <private/qquickwebenginenavigationrequest_p.h> #include <private/qquickwebenginenewviewrequest_p.h> @@ -63,6 +64,8 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineView::staticMetaObject << &QQuickWebEngineCertificateError::staticMetaObject << &QQuickWebEngineDownloadItem::staticMetaObject + << &QQuickWebEngineHistory::staticMetaObject + << &QQuickWebEngineHistoryListModel::staticMetaObject << &QQuickWebEngineLoadRequest::staticMetaObject << &QQuickWebEngineNavigationRequest::staticMetaObject << &QQuickWebEngineNewViewRequest::staticMetaObject @@ -123,7 +126,6 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loading --> bool" << "QQuickWebEngineView.loadProgress --> int" << "QQuickWebEngineView.titleChanged() --> void" - << "QQuickWebEngineView.navigationHistoryChanged() --> void" << "QQuickWebEngineView.loadingChanged(QQuickWebEngineLoadRequest*) --> void" << "QQuickWebEngineView.certificateError(QQuickWebEngineCertificateError*) --> void" << "QQuickWebEngineView.loadProgressChanged() --> void" @@ -138,11 +140,13 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loadHtml(QString) --> void" << "QQuickWebEngineView.goBack() --> void" << "QQuickWebEngineView.goForward() --> void" + << "QQuickWebEngineView.goBackOrForward(int) --> void" << "QQuickWebEngineView.stop() --> void" << "QQuickWebEngineView.reload() --> void" << "QQuickWebEngineView.zoomFactor --> double" << "QQuickWebEngineView.zoomFactorChanged(double) --> void" << "QQuickWebEngineView.profile --> QQuickWebEngineProfile*" + << "QQuickWebEngineView.navigationHistory --> QQuickWebEngineHistory*" << "QQuickWebEngineView.newViewRequested(QQuickWebEngineNewViewRequest*) --> void" << "QQuickWebEngineDownloadItem.id --> uint" << "QQuickWebEngineDownloadItem.state --> DownloadState" @@ -156,6 +160,9 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineDownloadItem.progressChanged() --> void" << "QQuickWebEngineDownloadItem.pathChanged() --> void" << "QQuickWebEngineDownloadItem.cancel() --> void" + << "QQuickWebEngineHistory.items --> QQuickWebEngineHistoryListModel*" + << "QQuickWebEngineHistory.backItems --> QQuickWebEngineHistoryListModel*" + << "QQuickWebEngineHistory.forwardItems --> QQuickWebEngineHistoryListModel*" << "QQuickWebEngineLoadRequest.url --> QUrl" << "QQuickWebEngineLoadRequest.status --> QQuickWebEngineView::LoadStatus" << "QQuickWebEngineLoadRequest.errorString --> QString" diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml index 9312ed20e..2c8e9e1ea 100644 --- a/tests/quicktestbrowser/BrowserWindow.qml +++ b/tests/quicktestbrowser/BrowserWindow.qml @@ -161,10 +161,10 @@ ApplicationWindow { id: backHistoryMenu Instantiator { - model: currentWebView && currentWebView.experimental.navigationHistory.backItems + model: currentWebView && currentWebView.navigationHistory.backItems MenuItem { text: model.title - onTriggered: currentWebView.experimental.goBackTo(index) + onTriggered: currentWebView.goBackOrForward(model.offset) } onObjectAdded: backHistoryMenu.insertItem(index, object) @@ -176,10 +176,10 @@ ApplicationWindow { id: forwardHistoryMenu Instantiator { - model: currentWebView && currentWebView.experimental.navigationHistory.forwardItems + model: currentWebView && currentWebView.navigationHistory.forwardItems MenuItem { text: model.title - onTriggered: currentWebView.experimental.goForwardTo(index) + onTriggered: currentWebView.goBackOrForward(model.offset) } onObjectAdded: forwardHistoryMenu.insertItem(index, object) |