diff options
| author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-24 20:57:21 +0200 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-07-21 14:22:41 +0200 |
| commit | 13254e7950a032ebbeb11b1cf54b850c8326fb30 (patch) | |
| tree | 72e311bd6e27982be6727cc70e2b182174938a84 /src/core/web_contents_delegate_qt.cpp | |
| parent | abd050e9806123cbc6288e7d33ed01ceb2921766 (diff) | |
WebEngineNavigationRequest: add accept/reject and deprecate setAction
Match naming with others and use accept/reject methods to handle request.
Also, allow to use request object after call scope in QML.
[ChangeLog][QWebEngineQuick][WebEngineNavigationRequest] setAction(action)
is deprecated in favor of new accept/reject methods
Pick-to: 6.2
Change-Id: I83252370e2e83017008f6951f98b7ecad119e232
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 5366e6a26..ef79c8f47 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -737,9 +737,7 @@ void WebContentsDelegateQt::launchExternalURL(const QUrl &url, ui::PageTransitio } if (navigationAllowedByPolicy) { - int navigationRequestAction = WebContentsAdapterClient::AcceptRequest; - m_viewClient->navigationRequested(pageTransitionToNavigationType(page_transition), url, navigationRequestAction, is_main_frame); - navigationRequestAccepted = navigationRequestAction == WebContentsAdapterClient::AcceptRequest; + m_viewClient->navigationRequested(pageTransitionToNavigationType(page_transition), url, navigationRequestAccepted, is_main_frame); #ifndef QT_NO_DESKTOPSERVICES if (navigationRequestAccepted) QDesktopServices::openUrl(url); |