From 9167c802f9a05394f72e0ba0dfb744b415686f46 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 30 Apr 2021 12:10:54 +0200 Subject: Make handling of certificate errors possible from a signal Task-number: QTBUG-74587 Change-Id: I9955a4c70b339523b5e9e9d6dffe928e61fbab90 Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc | 2 +- examples/webenginewidgets/simplebrowser/webpage.cpp | 3 ++- examples/webenginewidgets/simplebrowser/webpage.h | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc index 2bbe3fe33..905fc3244 100644 --- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc +++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc @@ -224,7 +224,7 @@ whether the certificate should be ignored. \quotefromfile webenginewidgets/simplebrowser/webpage.cpp - \skipto WebPage::certificateError( + \skipto WebPage::handleCertificateError( \printuntil } \printuntil } diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp index 4db147526..985e83ca2 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.cpp +++ b/examples/webenginewidgets/simplebrowser/webpage.cpp @@ -59,9 +59,10 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent) : QWebEnginePage(profile, parent) { connect(this, &QWebEnginePage::selectClientCertificate, this, &WebPage::handleSelectClientCertificate); + connect(this, &QWebEnginePage::certificateError, this, &WebPage::handleCertificateError); } -void WebPage::certificateError(QWebEngineCertificateError error) +void WebPage::handleCertificateError(QWebEngineCertificateError error) { error.defer(); QTimer::singleShot(0, this, diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h index 00eb48156..e01d1e1eb 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.h +++ b/examples/webenginewidgets/simplebrowser/webpage.h @@ -65,10 +65,8 @@ public: signals: void createCertificateErrorDialog(QWebEngineCertificateError error); -protected: - void certificateError(QWebEngineCertificateError error) override; - private slots: + void handleCertificateError(QWebEngineCertificateError error); void handleSelectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection); }; -- cgit v1.2.3