diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-07-12 11:52:15 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-07-12 15:25:40 +0000 |
| commit | 5be01d2ffd3dbc2b023dd1ffb75d376019ee934e (patch) | |
| tree | fe18806f69903e910bc73ab928c98f3946c74386 /src/webenginequick | |
| parent | 7b7c4894151f3af05e635031a4626eeb04173bb6 (diff) | |
Get rid of private methods of QWebEngineNewWindowRequest
Pick-to: 6.2
Change-Id: I40072b45ceffa1a2c92027a4c01239974b8ac498
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 23d89440d..cfd17e5aa 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -64,6 +64,7 @@ #include "qwebenginescriptcollection.h" #include <QtWebEngineCore/private/qwebenginecontextmenurequest_p.h> #include <QtWebEngineCore/private/qwebenginehistory_p.h> +#include <QtWebEngineCore/private/qwebenginenewwindowrequest_p.h> #include <QtWebEngineCore/private/qwebenginescriptcollection_p.h> #include "qwebengineregisterprotocolhandlerrequest.h" #if QT_CONFIG(webenginequick_testsupport) @@ -527,7 +528,7 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne Q_EMIT q->newViewRequested(&request); - if (request.isHandled()) + if (request.d_ptr->isRequestHandled) return newWebContents; return nullptr; } @@ -1666,19 +1667,20 @@ void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &va void QQuickWebEngineView::acceptAsNewView(QWebEngineNewWindowRequest *request) { Q_D(QQuickWebEngineView); - if (!request || (!request->adapter() && !request->requestedUrl().isValid()) || request->isHandled()) { + if (!request || (!request->d_ptr->adapter && !request->requestedUrl().isValid()) + || request->d_ptr->isRequestHandled) { qWarning("Trying to open an empty request, it was either already used or was invalidated." "\nYou must complete the request synchronously within the newViewRequested signal handler." " If a view hasn't been adopted before returning, the request will be invalidated."); return; } - if (auto adapter = request->adapter()) + if (auto adapter = request->d_ptr->adapter) d->adoptWebContents(adapter.data()); else setUrl(request->requestedUrl()); - request->setHandled(); + request->d_ptr->setHandled(); } #if QT_CONFIG(draganddrop) |