diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:27:38 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:27:51 +0200 |
commit | f9e951d0946fe0fcd51e9015108f92c46ecc8138 (patch) | |
tree | a003c9ccf4b70654fe480c86096dac6c93a9ce07 /src/webenginewidgets/api | |
parent | 9da1716d05770f6deb3af654f28024234d711eb7 (diff) | |
parent | 96df24618fbbc0e06a24e93b7e9aefb0f923f4af (diff) |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I00f64f15ec2aee18d8e6c7b5f59dfae49be1cba8
Diffstat (limited to 'src/webenginewidgets/api')
-rw-r--r-- | src/webenginewidgets/api/qwebenginecertificateerror.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp index ebe3cdbec..289bb7ec0 100644 --- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp +++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp @@ -85,6 +85,10 @@ QWebEngineCertificateError::~QWebEngineCertificateError() This enum describes the type of certificate error encountered. + The values of this enum type match the SSL errors Chromium provides. + QSslError::SslError values are not used directly, because the Qt error + categories cannot be mapped to the Chromium error categories. + \value SslPinnedKeyNotInCertificateChain The certificate did not match the built-in public keys pinned for the host name. \value CertificateCommonNameInvalid The certificate's common name did not match the host name. |