diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-22 20:08:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-22 20:15:13 +0200 |
| commit | 29e75ab2ede9e13321faeec61e1d77f3caa6118c (patch) | |
| tree | bafd4479f5a84db963eef0c04e7a5d86627f6691 /src/core/certificate_error_controller.cpp | |
| parent | 98702f186c66a6eedb90b5d4823c53afd8794770 (diff) | |
| parent | bb6fffd1ad3168edc9d67492cca585084d8ae6b4 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/certificate_error_controller.cpp
src/core/compositor/display_gl_output_surface_qsg.cpp
src/webengine/doc/src/webengine_certificate_error.qdoc
tests/auto/quick/qmltests/data/tst_certificateError.qml
Change-Id: I976958a0833030bfd7c3ed762585eb12031306b0
Diffstat (limited to 'src/core/certificate_error_controller.cpp')
| -rw-r--r-- | src/core/certificate_error_controller.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/certificate_error_controller.cpp b/src/core/certificate_error_controller.cpp index 03918e158..0c0137ca4 100644 --- a/src/core/certificate_error_controller.cpp +++ b/src/core/certificate_error_controller.cpp @@ -206,7 +206,7 @@ QString CertificateErrorController::errorString() const case QWebEngineCertificateError::CertificateContainsErrors: return getQStringForMessageId(IDS_CERT_ERROR_CONTAINS_ERRORS_DESCRIPTION); case QWebEngineCertificateError::CertificateNoRevocationMechanism: - return getQStringForMessageId(IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DETAILS); + return getQStringForMessageId(IDS_CERT_ERROR_NO_REVOCATION_MECHANISM_DESCRIPTION); case QWebEngineCertificateError::CertificateRevoked: return getQStringForMessageId(IDS_CERT_ERROR_REVOKED_CERT_DESCRIPTION); case QWebEngineCertificateError::CertificateInvalid: @@ -223,6 +223,8 @@ QString CertificateErrorController::errorString() const return getQStringForMessageId(IDS_CERT_ERROR_VALIDITY_TOO_LONG_DESCRIPTION); case QWebEngineCertificateError::CertificateTransparencyRequired: return getQStringForMessageId(IDS_CERT_ERROR_CERTIFICATE_TRANSPARENCY_REQUIRED_DESCRIPTION); + case QWebEngineCertificateError::SslObsoleteVersion: + return getQStringForMessageId(IDS_SSL_ERROR_OBSOLETE_VERSION_DESCRIPTION); case QWebEngineCertificateError::CertificateUnableToCheckRevocation: // Deprecated in Chromium. default: break; |