diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-02-05 13:42:23 +0100 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-03-03 21:39:11 +0100 |
| commit | eb92ad14753b91fc63ab17ab79c6637512921423 (patch) | |
| tree | 77e2a854c057358a8f268d9c82f1c7fc551f62bd /tests/auto/quick/publicapi/tst_publicapi.cpp | |
| parent | cd12379d43f8c2df14b19ebced316aa94b3f6043 (diff) | |
Move QQuickWebEngineLoadRequest to core as a base api type
Prepare it to be used in widgets api for load status change. Turn it into
simple value type which is allowed to be copied, stored and spied upon.
[ChangeLog] Move WebEngineLoadRequest as a basic type into QtWebEngineCore
Task-number: QTBUG-74585
Change-Id: Ie182da02a539a89323b8bbec07f1daa700309e70
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests/auto/quick/publicapi/tst_publicapi.cpp')
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index e79ed86de..ba76ad757 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -43,12 +43,12 @@ #include <QtWebEngineCore/QWebEngineContextMenuRequest> #include <QtWebEngineCore/QWebEngineDownloadRequest> #include <QtWebEngineCore/QWebEngineScript> +#include <QtWebEngineCore/QWebEngineLoadRequest> #include <private/qquickwebengineview_p.h> #include <private/qquickwebengineaction_p.h> #include <private/qquickwebengineclientcertificateselection_p.h> #include <private/qquickwebenginedialogrequests_p.h> #include <private/qquickwebenginehistory_p.h> -#include <private/qquickwebengineloadrequest_p.h> #include <private/qquickwebenginenavigationrequest_p.h> #include <private/qquickwebenginenewviewrequest_p.h> #include <private/qquickwebenginesettings_p.h> @@ -68,7 +68,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject * << &QWebEngineDownloadRequest::staticMetaObject << &QQuickWebEngineHistory::staticMetaObject << &QQuickWebEngineHistoryListModel::staticMetaObject - << &QQuickWebEngineLoadRequest::staticMetaObject + << &QWebEngineLoadRequest::staticMetaObject << &QQuickWebEngineNavigationRequest::staticMetaObject << &QQuickWebEngineNewViewRequest::staticMetaObject << &QQuickWebEngineProfile::staticMetaObject @@ -311,11 +311,22 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineJavaScriptDialogRequest.securityOrigin --> QUrl" << "QQuickWebEngineJavaScriptDialogRequest.title --> QString" << "QQuickWebEngineJavaScriptDialogRequest.type --> DialogType" - << "QQuickWebEngineLoadRequest.errorCode --> int" - << "QQuickWebEngineLoadRequest.errorDomain --> QQuickWebEngineView::ErrorDomain" - << "QQuickWebEngineLoadRequest.errorString --> QString" - << "QQuickWebEngineLoadRequest.status --> QQuickWebEngineView::LoadStatus" - << "QQuickWebEngineLoadRequest.url --> QUrl" + << "QWebEngineLoadRequest.errorCode --> int" + << "QWebEngineLoadRequest.errorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.errorString --> QString" + << "QWebEngineLoadRequest.status --> LoadStatus" + << "QWebEngineLoadRequest.url --> QUrl" + << "QWebEngineLoadRequest.LoadFailedStatus --> LoadStatus" + << "QWebEngineLoadRequest.LoadStartedStatus --> LoadStatus" + << "QWebEngineLoadRequest.LoadStoppedStatus --> LoadStatus" + << "QWebEngineLoadRequest.LoadSucceededStatus --> LoadStatus" + << "QWebEngineLoadRequest.CertificateErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.ConnectionErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.DnsErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.FtpErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.HttpErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.InternalErrorDomain --> ErrorDomain" + << "QWebEngineLoadRequest.NoErrorDomain --> ErrorDomain" << "QQuickWebEngineNavigationRequest.action --> QQuickWebEngineView::NavigationRequestAction" << "QQuickWebEngineNavigationRequest.actionChanged() --> void" << "QQuickWebEngineNavigationRequest.isMainFrame --> bool" @@ -707,7 +718,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loadProgress --> int" << "QQuickWebEngineView.loadProgressChanged() --> void" << "QQuickWebEngineView.loading --> bool" - << "QQuickWebEngineView.loadingChanged(QQuickWebEngineLoadRequest*) --> void" + << "QQuickWebEngineView.loadingChanged(QWebEngineLoadRequest) --> void" << "QQuickWebEngineView.navigationHistory --> QQuickWebEngineHistory*" << "QQuickWebEngineView.navigationRequested(QQuickWebEngineNavigationRequest*) --> void" << "QQuickWebEngineView.newViewRequested(QQuickWebEngineNewViewRequest*) --> void" |