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/plugin/plugin.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/plugin/plugin.cpp')
| -rw-r--r-- | src/webenginequick/plugin/plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginequick/plugin/plugin.cpp b/src/webenginequick/plugin/plugin.cpp index 1e54dbd2f..7865f9863 100644 --- a/src/webenginequick/plugin/plugin.cpp +++ b/src/webenginequick/plugin/plugin.cpp @@ -44,7 +44,6 @@ #include <QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h> #include <QtWebEngineQuick/private/qquickwebenginehistory_p.h> #include <QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h> -#include <QtWebEngineQuick/private/qquickwebenginenavigationrequest_p.h> #include <QtWebEngineQuick/private/qquickwebenginesettings_p.h> #include <QtWebEngineQuick/private/qquickwebenginesingleton_p.h> #include <QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h> @@ -54,6 +53,7 @@ #include <QtWebEngineCore/qwebenginefindtextresult.h> #include <QtWebEngineCore/qwebenginefullscreenrequest.h> #include <QtWebEngineCore/qwebengineloadrequest.h> +#include <QtWebEngineCore/qwebenginenavigationrequest.h> #include <QtWebEngineCore/qwebenginenewwindowrequest.h> #include <QtWebEngineCore/qwebenginenotification.h> #include <QtWebEngineCore/qwebenginequotarequest.h> @@ -87,7 +87,7 @@ public: qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView"); qmlRegisterUncreatableType<QWebEngineLoadRequest>(uri, 1, 0, "WebEngineLoadRequest", msgUncreatableType("WebEngineLoadRequest")); - qmlRegisterUncreatableType<QQuickWebEngineNavigationRequest>(uri, 1, 0, "WebEngineNavigationRequest", msgUncreatableType("WebEngineNavigationRequest")); + qmlRegisterUncreatableType<QWebEngineNavigationRequest>(uri, 1, 0, "WebEngineNavigationRequest", msgUncreatableType("WebEngineNavigationRequest")); qmlRegisterType<QQuickWebEngineView, 1>(uri, 1, 1, "WebEngineView"); qmlRegisterType<QQuickWebEngineView, 2>(uri, 1, 2, "WebEngineView"); |