diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 15:26:45 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-06 17:33:05 +0000 |
| commit | 05a7dba5c2733b5893fbea8aac89af5df13d53fb (patch) | |
| tree | 0e33442d3e946e456323d792219ceb09b8234bc7 /src/webenginequick/api/qquickwebengineview.cpp | |
| parent | a060012ecef7ecc60f5518b6718136b22a10dc6b (diff) | |
| download | qtwebengine-05a7dba5c2733b5893fbea8aac89af5df13d53fb.tar.gz | |
Restore WebEngineNewViewRequest::openIn method
Change-Id: Ib765970d4c57f742a53cd4d2c870b00628d527aa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit ca4ba8beb736efcd95445cc801e2b5a77642a931)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 3791d9c6b..7688c38cd 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -51,6 +51,7 @@ #include "qquickwebengineclientcertificateselection_p.h" #include "qquickwebenginedialogrequests_p.h" #include "qquickwebenginefaviconprovider_p_p.h" +#include "qquickwebenginenewviewrequest_p.h" #include "qquickwebengineprofile_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginetouchhandleprovider_p_p.h" @@ -59,7 +60,6 @@ #include "qwebenginefullscreenrequest.h" #include "qwebengineloadinginfo.h" #include "qwebenginenavigationrequest.h" -#include "qwebenginenewwindowrequest.h" #include "qwebenginequotarequest.h" #include "qwebenginescriptcollection.h" #include <QtWebEngineCore/private/qwebenginecontextmenurequest_p.h> @@ -526,8 +526,8 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne { Q_Q(QQuickWebEngineView); Q_ASSERT(newWebContents); - QWebEngineNewWindowRequest request(toDestinationType(disposition), geometry, - targetUrl, userGesture, newWebContents); + QQuickWebEngineNewViewRequest request(toDestinationType(disposition), geometry, + targetUrl, userGesture, newWebContents); Q_EMIT q->newViewRequested(&request); @@ -1774,15 +1774,15 @@ void QQuickWebEngineView::triggerWebAction(WebAction action) break; case OpenLinkInNewWindow: if (d->m_contextMenuRequest->filteredLinkUrl().isValid()) { - QWebEngineNewWindowRequest request(QWebEngineNewWindowRequest::InNewWindow, QRect(), - d->m_contextMenuRequest->filteredLinkUrl(), true, nullptr); + QQuickWebEngineNewViewRequest request(QWebEngineNewWindowRequest::InNewWindow, QRect(), + d->m_contextMenuRequest->filteredLinkUrl(), true, nullptr); Q_EMIT newViewRequested(&request); } break; case OpenLinkInNewTab: if (d->m_contextMenuRequest->filteredLinkUrl().isValid()) { - QWebEngineNewWindowRequest request(QWebEngineNewWindowRequest::InNewBackgroundTab, QRect(), - d->m_contextMenuRequest->filteredLinkUrl(), true, nullptr); + QQuickWebEngineNewViewRequest request(QWebEngineNewWindowRequest::InNewBackgroundTab, QRect(), + d->m_contextMenuRequest->filteredLinkUrl(), true, nullptr); Q_EMIT newViewRequested(&request); } break; |