diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-28 12:31:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-04 01:54:46 +0200 |
| commit | 227279bf2f22c740f3f2fdc34f1032d4177dc32a (patch) | |
| tree | 76b69a5b72a12dffd95948dde232ac5f7f55cf96 /src/webenginequick/api/qquickwebengineview.cpp | |
| parent | a806467ff37414dc52b5a15a351bde5505afac6e (diff) | |
| download | qtwebengine-227279bf2f22c740f3f2fdc34f1032d4177dc32a.tar.gz | |
Move QQuickWebEngineNavigationRequest to Core
Adds navigationRequested() to QWebEnginePage and exposes more
information about navigation requests than the old
acceptNavigationRequest() method.
Change-Id: Ibb8d750bacd1060c3086ffe2c85336abd216bab0
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/webenginequick/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 4eaa5e28b..5524b8954 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -52,7 +52,6 @@ #include "qquickwebengineclientcertificateselection_p.h" #include "qquickwebenginedialogrequests_p.h" #include "qquickwebenginefaviconprovider_p_p.h" -#include "qquickwebenginenavigationrequest_p.h" #include "qquickwebengineprofile_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginetouchhandleprovider_p_p.h" @@ -60,6 +59,7 @@ #include "qwebenginefindtextresult.h" #include "qwebenginefullscreenrequest.h" #include "qwebengineloadrequest.h" +#include "qwebenginenavigationrequest.h" #include "qwebenginenewwindowrequest.h" #include "qwebenginequotarequest.h" #include "qwebenginescriptcollection.h" @@ -290,7 +290,7 @@ void QQuickWebEngineViewPrivate::contextMenuRequested(QWebEngineContextMenuReque void QQuickWebEngineViewPrivate::navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) { Q_Q(QQuickWebEngineView); - QQuickWebEngineNavigationRequest navigationRequest(url, static_cast<QQuickWebEngineView::NavigationType>(navigationType), isMainFrame); + QWebEngineNavigationRequest navigationRequest(url, static_cast<QWebEngineNavigationRequest::NavigationType>(navigationType), isMainFrame); Q_EMIT q->navigationRequested(&navigationRequest); navigationRequestAction = navigationRequest.action(); |