diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 15:26:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-06 15:08:23 +0200 |
| commit | ca4ba8beb736efcd95445cc801e2b5a77642a931 (patch) | |
| tree | ba1b3c2427463d43bf0fa78fcae0313d7b590fc0 /tests/auto/quick | |
| parent | fa0550312d356519e8ddb614f3419bac31e746c6 (diff) | |
Restore WebEngineNewViewRequest::openIn method
Pick-to: 6.2
Change-Id: Ib765970d4c57f742a53cd4d2c870b00628d527aa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_newViewRequest.qml | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 46cc25514..a0db27fab 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -52,6 +52,7 @@ #include <private/qquickwebengineclientcertificateselection_p.h> #include <private/qquickwebenginedialogrequests_p.h> #include <private/qquickwebenginedownloadrequest_p.h> +#include <private/qquickwebenginenewviewrequest_p.h> #include <private/qquickwebenginesettings_p.h> #include <private/qquickwebenginesingleton_p.h> @@ -80,6 +81,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject * << &QQuickWebEngineColorDialogRequest::staticMetaObject << &QQuickWebEngineFileDialogRequest::staticMetaObject << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject + << &QQuickWebEngineNewViewRequest::staticMetaObject << &QQuickWebEngineTooltipRequest::staticMetaObject << &QWebEngineContextMenuRequest::staticMetaObject << &QWebEngineCertificateError::staticMetaObject @@ -351,6 +353,7 @@ static const QStringList expectedAPI = QStringList() << "QWebEngineNewWindowRequest.InNewDialog --> DestinationType" << "QWebEngineNewWindowRequest.InNewTab --> DestinationType" << "QWebEngineNewWindowRequest.InNewWindow --> DestinationType" + << "QQuickWebEngineNewViewRequest.openIn(QQuickWebEngineView*) --> void" << "QQuickWebEngineProfile.AllowPersistentCookies --> PersistentCookiesPolicy" << "QQuickWebEngineProfile.DiskHttpCache --> HttpCacheType" << "QQuickWebEngineProfile.ForcePersistentCookies --> PersistentCookiesPolicy" @@ -725,7 +728,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.loading --> bool" << "QQuickWebEngineView.loadingChanged(QWebEngineLoadingInfo) --> void" << "QQuickWebEngineView.navigationRequested(QWebEngineNavigationRequest*) --> void" - << "QQuickWebEngineView.newViewRequested(QWebEngineNewWindowRequest*) --> void" + << "QQuickWebEngineView.newViewRequested(QQuickWebEngineNewViewRequest*) --> void" << "QQuickWebEngineView.pdfPrintingFinished(QString,bool) --> void" << "QQuickWebEngineView.printRequested() --> void" << "QQuickWebEngineView.printToPdf(QJSValue) --> void" diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml index c79a3aee8..ac402674d 100644 --- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml +++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml @@ -69,9 +69,11 @@ TestWebEngineView { "}", webEngineView); if (viewType === "dialog") - dialog.webEngineView.acceptAsNewView(request); + request.openIn(dialog.webEngineView); + else if (viewType === "null") + request.openIn(0); else if (viewType === "webEngineView") - webEngineView.acceptAsNewView(request); + request.openIn(webEngineView); } TestCase { |