From 5dde7a21706b399a6c14b3ab0a12e70f5d26dafa Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 6 Aug 2020 12:26:44 +0200 Subject: Unify certificate error handling Before we move the certificate error to core, unify error handling between qml and widgets. [ChangeLog] WebPage::certificateError does not return bool it is enough to call defer, ignoreCertificateError() or rejectCertificate(). Change-Id: I14be40f1ab6b4cbded550260d66152f51cf47de2 Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/simplebrowser/webpage.cpp | 3 +-- examples/webenginewidgets/simplebrowser/webpage.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp index 417b29b52..d8f954c90 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.cpp +++ b/examples/webenginewidgets/simplebrowser/webpage.cpp @@ -70,7 +70,7 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) connect(this, &QWebEnginePage::selectClientCertificate, this, &WebPage::handleSelectClientCertificate); } -bool WebPage::certificateError(const QWebEngineCertificateError &error) +void WebPage::certificateError(const QWebEngineCertificateError &error) { QWidget *mainWindow = view()->window(); @@ -99,7 +99,6 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error) error.rejectCertificate(); } }); - return true; } void WebPage::handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth) diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h index d3f50bd6e..fbb15fc0f 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.h +++ b/examples/webenginewidgets/simplebrowser/webpage.h @@ -62,7 +62,7 @@ public: WebPage(QWebEngineProfile *profile, QObject *parent = nullptr); protected: - bool certificateError(const QWebEngineCertificateError &error) override; + void certificateError(const QWebEngineCertificateError &error) override; private slots: void handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth); -- cgit v1.2.3