diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-12-18 20:02:02 +0100 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-04 18:41:46 +0200 |
commit | 742b9db0e34c8fc08e9f50c3053aed5f501f08d2 (patch) | |
tree | 81265ca9b3bee9f78389b8855c7cf565769e15ce /tests/auto/quick/publicapi/tst_publicapi.cpp | |
parent | 881339e9d9054c46f2621119246de7a13c83761a (diff) |
Merge WebEngineHistory's quick implementation into QWebEngineHistory
[ChangeLog][QWebEngineCore][QWebEngineHistory] New methods to access
navigation history as a model through new class QWebEngineHistoryModel.
[ChangeLog][QWebEngineQuick] QQuickWebEngineHistory is merged into QWebEngineHistory.
Task-number: QTBUG-74585
Change-Id: I9f9a73bbaf3954282dfc220cfc2c4cb08a37fb73
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/publicapi/tst_publicapi.cpp')
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 16 |
1 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 a125d84f3..4ea079b63 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -37,6 +37,7 @@ #include <QtWebEngineCore/QWebEngineCertificateError> #include <QtWebEngineCore/QWebEngineFindTextResult> #include <QtWebEngineCore/QWebEngineFullScreenRequest> +#include <QtWebEngineCore/QWebEngineHistory> #include <QtWebEngineCore/QWebEngineNavigationRequest> #include <QtWebEngineCore/QWebEngineNewWindowRequest> #include <QtWebEngineCore/QWebEngineNotification> @@ -50,7 +51,6 @@ #include <private/qquickwebengineaction_p.h> #include <private/qquickwebengineclientcertificateselection_p.h> #include <private/qquickwebenginedialogrequests_p.h> -#include <private/qquickwebenginehistory_p.h> #include <private/qquickwebenginesettings_p.h> #include <private/qquickwebenginesingleton_p.h> @@ -66,8 +66,8 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject * << &QQuickWebEngineClientCertificateOption::staticMetaObject << &QQuickWebEngineClientCertificateSelection::staticMetaObject << &QWebEngineDownloadRequest::staticMetaObject - << &QQuickWebEngineHistory::staticMetaObject - << &QQuickWebEngineHistoryListModel::staticMetaObject + << &QWebEngineHistory::staticMetaObject + << &QWebEngineHistoryModel::staticMetaObject << &QQuickWebEngineProfile::staticMetaObject << &QQuickWebEngineSettings::staticMetaObject << &QWebEngineFullScreenRequest::staticMetaObject @@ -294,10 +294,10 @@ static const QStringList expectedAPI = QStringList() << "QWebEngineFullScreenRequest.origin --> QUrl" << "QWebEngineFullScreenRequest.reject() --> void" << "QWebEngineFullScreenRequest.toggleOn --> bool" - << "QQuickWebEngineHistory.backItems --> QQuickWebEngineHistoryListModel*" - << "QQuickWebEngineHistory.clear() --> void" - << "QQuickWebEngineHistory.forwardItems --> QQuickWebEngineHistoryListModel*" - << "QQuickWebEngineHistory.items --> QQuickWebEngineHistoryListModel*" + << "QWebEngineHistory.backItems --> QWebEngineHistoryModel*" + << "QWebEngineHistory.clear() --> void" + << "QWebEngineHistory.forwardItems --> QWebEngineHistoryModel*" + << "QWebEngineHistory.items --> QWebEngineHistoryModel*" << "QQuickWebEngineJavaScriptDialogRequest.DialogTypeAlert --> DialogType" << "QQuickWebEngineJavaScriptDialogRequest.DialogTypeBeforeUnload --> DialogType" << "QQuickWebEngineJavaScriptDialogRequest.DialogTypeConfirm --> DialogType" @@ -721,7 +721,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loadProgressChanged() --> void" << "QQuickWebEngineView.loading --> bool" << "QQuickWebEngineView.loadingChanged(QWebEngineLoadRequest) --> void" - << "QQuickWebEngineView.navigationHistory --> QQuickWebEngineHistory*" + << "QQuickWebEngineView.navigationHistory --> QWebEngineHistory*" << "QQuickWebEngineView.navigationRequested(QWebEngineNavigationRequest*) --> void" << "QQuickWebEngineView.newViewRequested(QWebEngineNewWindowRequest*) --> void" << "QQuickWebEngineView.pdfPrintingFinished(QString,bool) --> void" |