diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-30 17:15:57 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-03 02:40:25 +0200 |
| commit | 82fe139dae5205a1683fb2b344c5dc867597c443 (patch) | |
| tree | eeae61e1f34ebbc8536ebc2681d43de8dfb6e475 /src/webenginequick/plugin/plugin.cpp | |
| parent | 5a0b312214ac182749040dac7ca09610c2124fbd (diff) | |
| download | qtwebengine-82fe139dae5205a1683fb2b344c5dc867597c443.tar.gz | |
Move createWindow to a signal
Ports QQuickWebEngineNewViewRequest to QtWebEngineCore.
[ChangeLog][QtWebEngineQuick][WebEngineView]
WebEngineView::NewViewRequested is now handled with
WebEngineView::acceptAsNewView() instead of with
WebEngineNewViewRequest::openIn().
Task-number: QTBUG-74587
Change-Id: I9b27128948076e13f2c228458e1e7491df12153d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/webenginequick/plugin/plugin.cpp')
| -rw-r--r-- | src/webenginequick/plugin/plugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webenginequick/plugin/plugin.cpp b/src/webenginequick/plugin/plugin.cpp index ead71694b..1e54dbd2f 100644 --- a/src/webenginequick/plugin/plugin.cpp +++ b/src/webenginequick/plugin/plugin.cpp @@ -45,7 +45,6 @@ #include <QtWebEngineQuick/private/qquickwebenginehistory_p.h> #include <QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h> #include <QtWebEngineQuick/private/qquickwebenginenavigationrequest_p.h> -#include <QtWebEngineQuick/private/qquickwebenginenewviewrequest_p.h> #include <QtWebEngineQuick/private/qquickwebenginesettings_p.h> #include <QtWebEngineQuick/private/qquickwebenginesingleton_p.h> #include <QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h> @@ -55,6 +54,7 @@ #include <QtWebEngineCore/qwebenginefindtextresult.h> #include <QtWebEngineCore/qwebenginefullscreenrequest.h> #include <QtWebEngineCore/qwebengineloadrequest.h> +#include <QtWebEngineCore/qwebenginenewwindowrequest.h> #include <QtWebEngineCore/qwebenginenotification.h> #include <QtWebEngineCore/qwebenginequotarequest.h> #include <QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h> @@ -113,8 +113,7 @@ public: qmlRegisterUncreatableType<QWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", msgUncreatableType("WebEngineCertificateError")); qmlRegisterUncreatableType<QWebEngineDownloadRequest>(uri, 1, 1, "WebEngineDownloadRequest", msgUncreatableType("WebEngineDownloadRequest")); - qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 1, 1, "WebEngineNewViewRequest", msgUncreatableType("WebEngineNewViewRequest")); - qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest, 1>(uri, 1, 5, "WebEngineNewViewRequest", tr("Cannot create separate instance of WebEngineNewViewRequest")); + qmlRegisterUncreatableType<QWebEngineNewWindowRequest>(uri, 1, 1, "WebEngineNewViewRequest", msgUncreatableType("WebEngineNewViewRequest")); qmlRegisterUncreatableType<QQuickWebEngineSettings>(uri, 1, 1, "WebEngineSettings", msgUncreatableType("WebEngineSettings")); qmlRegisterUncreatableType<QQuickWebEngineSettings, 1>(uri, 1, 2, "WebEngineSettings", msgUncreatableType("WebEngineSettings")); qmlRegisterUncreatableType<QQuickWebEngineSettings, 2>(uri, 1, 3, "WebEngineSettings", msgUncreatableType("WebEngineSettings")); |