diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-08-25 13:07:03 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-08-26 09:58:02 +0200 |
| commit | 421958b15df316cac15235173b5202533c766b0d (patch) | |
| tree | cceb975d67f9314ded42e3bd75643524531eda11 /src/webenginequick | |
| parent | 30e79cfcd9d94b3ced981fd7042bfb13e37cadf8 (diff) | |
Doc: Fix remaining documentation warnings
* WebEngineCertificateError::ignoreCertificateError() was renamed to
acceptCertificate().
* Use correct \instantiates class for WebEngineNewWindowRequest.
Pick-to: 6.2
Task-number: QTBUG-95860
Change-Id: I42cc4a8939625b432cb4c6f68b26423b6dc3fa7d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/doc/src/webengine_certificate_error.qdoc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/webenginequick/doc/src/webengine_certificate_error.qdoc b/src/webenginequick/doc/src/webengine_certificate_error.qdoc index 8c032dc8b..3027aa4c2 100644 --- a/src/webenginequick/doc/src/webengine_certificate_error.qdoc +++ b/src/webenginequick/doc/src/webengine_certificate_error.qdoc @@ -38,13 +38,13 @@ 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 + 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 + The certificate error can be ignored by calling \l acceptCertificate(), which will resume loading the request. - It is possible to defer the decision of rejecting a certificate by calling \l defer, + 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 @@ -54,11 +54,10 @@ This function should be called when there is a need to postpone the decision whether to ignore a certificate error, for example, while waiting for user input. When called, the function pauses the - URL request until WebEngineCertificateError::ignoreCertificateError() or - WebEngineCertificateError::rejectCertificate() is called. + URL request until acceptCertificate() or rejectCertificate() is called. */ /*! - \qmlmethod void WebEngineCertificateError::ignoreCertificateError() + \qmlmethod void WebEngineCertificateError::acceptCertificate() The certificate error is ignored, and the web engine view continues to load the requested URL. */ |