Merge branch '5.6' into dev

Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78

1 files changed, 11 insertions, 0 deletions

diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 8be4adda0..ca60fedc2 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -127,6 +127,17 @@
     }
     \endqml
 
+    \section1 Managing Certificates
+
+    Qt WebEngine uses its own network stack, and therefore QSslConfiguration is not used to
+    open SSL connections. Instead, Qt WebEngine uses the root CA certificates from the operating
+    system to validate the peer's certificate.
+
+    The \l{WebEngineCertificateError::error} and \l{QWebEngineCertificateError::Error} enumerations
+    provide information about the types of certificate errors that might occur. The errors can be
+    handled by using the WebEngineView::certificateError QML method or by reimplementing the
+    QWebEnginePage::certificateError function.
+
     \section1 Using WebEngine Core
 
     Qt WebEngine Core provides an API shared by Qt WebEngine and Qt WebEngine Widgets for handling