Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty
	src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc

Change-Id: I90728e965399e51b626d538924de955f9abab5fe

1 files changed, 13 insertions, 2 deletions

diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
index 9570add65..561d1daf4 100644
--- a/src/webengine/api/qquickwebenginecertificateerror.cpp
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -69,8 +69,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
 */