diff options
| author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2016-02-18 15:17:49 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-02-24 11:07:35 +0000 |
| commit | 58e791df3d48c8d0c21219f88b05c63b0d398b28 (patch) | |
| tree | dc98b4576356d6e0e94e892a09ed1a7c6cd4ae15 | |
| parent | 918ca3ccd62f6d9270fb0019e89b69e4bd259d60 (diff) | |
Doc: Move info about WebEngineCertificate methods
...from WebEngine type to WebEngineCertificate type
introduction.
Change-Id: I8e8d7aae3f3cad6647a2a0537d2866c7827aba96
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/webengine/api/qquickwebenginecertificateerror.cpp | 15 | ||||
| -rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp index ea9b2bc11..7b06696d2 100644 --- a/src/webengine/api/qquickwebenginecertificateerror.cpp +++ b/src/webengine/api/qquickwebenginecertificateerror.cpp @@ -66,8 +66,19 @@ public: \brief A utility type for ignoring certificate errors or rejecting erroneous certificates. - This QML type contains information about a certificate error that occurred and provides a way - to ignore the error or reject the certificate. + This QML type contains information about a certificate error that occurred. The \l error + property holds the reason that the error occurred and the \l description property holds a + short localized description of the error. The \l url property holds the URL that triggered + the error. + + The certificate can be rejected by calling \l rejectCertificate, which will stop loading the + web engine request. By default, an invalid certificate will be automatically rejected. + + The certificate error can be ignored by calling \l ignoreCertificateError, which will + resume loading the request. + + It is possible to defer the decision of rejecting a certificate by calling \l defer, + which is useful when waiting for user input. \sa WebEngineView::certificateError */ diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index 0ce2f77be..3c27c293d 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -418,15 +418,8 @@ This signal is emitted when an invalid certificate error is raised while loading a given request. - The certificate error can be rejected by calling WebEngineCertificateError::rejectCertificate, - which will stop loading the request. - - The certificate error can be ignored by calling - WebEngineCertificateError::ignoreCertificateError, which will resume loading the request. - - It is possible to defer the decision of rejecting the given certificate by calling - WebEngineCertificateError::defer, which is useful when waiting for user input. - By default, the invalid certificate will be automatically rejected. + The certificate error can be handled by using the methods of the WebEngineCertificateError + type. The corresponding handler is \c onCertificateError. |