From b58b4c59f1beb5679f6d0edae5497bbc9eadbff3 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Mon, 12 Jul 2021 11:52:15 +0200 Subject: Get rid of private methods of QWebEngineNewWindowRequest Change-Id: I40072b45ceffa1a2c92027a4c01239974b8ac498 Reviewed-by: Michal Klocek (cherry picked from commit 5be01d2ffd3dbc2b023dd1ffb75d376019ee934e) Reviewed-by: Qt Cherry-pick Bot --- src/core/api/qwebenginepage.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/core/api/qwebenginepage.cpp') diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index df2eb7a65..9943def62 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -48,6 +48,7 @@ #include "qwebengineloadinginfo.h" #include "qwebenginenavigationrequest.h" #include "qwebenginenewwindowrequest.h" +#include "qwebenginenewwindowrequest_p.h" #include "qwebengineprofile.h" #include "qwebengineprofile_p.h" #include "qwebenginequotarequest.h" @@ -378,7 +379,7 @@ QWebEnginePagePrivate::adoptNewWindow(QSharedPointer newWebC Q_EMIT q->newWindowRequested(request); - if (request.isHandled()) + if (request.d_ptr->isRequestHandled) return newWebContents; return nullptr; } @@ -2250,9 +2251,9 @@ QSizeF QWebEnginePage::contentsSize() const void QWebEnginePage::acceptAsNewWindow(QWebEngineNewWindowRequest &request) { Q_D(QWebEnginePage); - auto adapter = request.adapter(); + auto adapter = request.d_ptr->adapter; QUrl url = request.requestedUrl(); - if ((!adapter && !url.isValid()) || request.isHandled()) { + if ((!adapter && !url.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 newWindowRequested signal handler." " If a view hasn't been adopted before returning, the request will be invalidated."); @@ -2268,7 +2269,7 @@ void QWebEnginePage::acceptAsNewWindow(QWebEngineNewWindowRequest &request) if (!geometry.isEmpty()) emit geometryChangeRequested(geometry); - request.setHandled(); + request.d_ptr->setHandled(); } /*! -- cgit v1.2.3