diff options
8 files changed, 18 insertions, 14 deletions
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); }; diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 367688c88..afb2eedda 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -1616,7 +1616,7 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont void QWebEnginePagePrivate::allowCertificateError(const QWebEngineCertificateError &error) { Q_Q(QWebEnginePage); - q->certificateError(error); + Q_EMIT q->certificateError(error); } void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller) @@ -2182,8 +2182,6 @@ void QWebEnginePage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel leve } } -void QWebEnginePage::certificateError(QWebEngineCertificateError) { } - bool QWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) { Q_UNUSED(url); diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 09b7b54df..9ccf8c917 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -341,6 +341,7 @@ Q_SIGNALS: void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost); void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode); + void certificateError(const QWebEngineCertificateError &certificateError); // Ex-QWebFrame signals void titleChanged(const QString &title); @@ -374,7 +375,6 @@ protected: virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& msg); virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result); virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID); - virtual void certificateError(QWebEngineCertificateError certificateError); virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); private: Q_DISABLE_COPY(QWebEnginePage) diff --git a/src/webenginequick/doc/src/qtwebengine-overview.qdoc b/src/webenginequick/doc/src/qtwebengine-overview.qdoc index 9908d46a8..4cbe35bcc 100644 --- a/src/webenginequick/doc/src/qtwebengine-overview.qdoc +++ b/src/webenginequick/doc/src/qtwebengine-overview.qdoc @@ -227,8 +227,8 @@ The \l{WebEngineCertificateError::error} and \l{QWebEngineCertificateError::Error} enumerations provide information about the types of certificate errors that might occur. The errors can be - handled by using the WebEngineView::certificateError QML method or by reimplementing the - QWebEnginePage::certificateError function. + handled by using the WebEngineView::certificateError QML method or by connecting to the + QWebEnginePage::certificateError signal. \section1 Proxy Support diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 087c171cb..9c9f40f74 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -520,7 +520,7 @@ /*! \fn void QWebEnginePage::certificateError(const QWebEngineCertificateError & certificateError) - This function is called when an invalid certificate error is raised while loading a given request. + This signal is emitted when an invalid certificate error is raised while loading a given request. The \a certificateError parameter contains information about the certificate and details of the error, it also provides the way to ignore the error and complete the request or stop loading diff --git a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp index 29b35df93..74c7e3bd4 100644 --- a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp +++ b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp @@ -48,9 +48,15 @@ private Q_SLOTS: struct PageWithCertificateErrorHandler : QWebEnginePage { + Q_OBJECT + +public: PageWithCertificateErrorHandler(bool defer, bool accept, QObject *p = nullptr) : QWebEnginePage(p), deferError(defer), acceptCertificate(accept) - , loadSpy(this, &QWebEnginePage::loadFinished) { + , loadSpy(this, &QWebEnginePage::loadFinished) + { + connect(this, &PageWithCertificateErrorHandler::certificateError, + this, &PageWithCertificateErrorHandler::onCertificateError); } bool deferError, acceptCertificate; @@ -58,7 +64,8 @@ struct PageWithCertificateErrorHandler : QWebEnginePage QSignalSpy loadSpy; QScopedPointer<QWebEngineCertificateError> error; - void certificateError(QWebEngineCertificateError e) override +public Q_SLOTS: + void onCertificateError(QWebEngineCertificateError e) { error.reset(new QWebEngineCertificateError(e)); if (deferError) { |