diff options
| author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-12-18 15:59:46 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-05 07:58:46 +0000 |
| commit | 3f92ac7456a6c89fee71623594058c928a727204 (patch) | |
| tree | 14f1b0aee8ebd4388b30f8e116118fc6212d7b09 /src | |
| parent | bee213d1f309daf8a16042ff21b1d6f81e6a5942 (diff) | |
Doc: certificate management in Qt WebEngine
Task-number: QTBUG-49987
Change-Id: I04440144566d7a0caf36f6eaf3b724a02cf58205
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 1 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 11 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 01485dc56..02f9a9ffd 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -39,6 +39,7 @@ tagfile = ../../../doc/qtwebengine/qtwebengine.tags depends += qtcore \ qtgui \ + qtnetwork \ qtqml \ qtquick \ qtquickcontrols \ diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 7eb7994b6..50d03a9f4 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 diff --git a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc index 41feecbe5..ca1309718 100644 --- a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc +++ b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc @@ -35,7 +35,6 @@ \l{http://doc.qt.io/archives/qt-5.3/qml-qtwebkit-webview.html}{QWebView API} to use the \l{Qt WebEngine} QWebEngineView. - \section1 Class Names The Qt WebEngine equivalent of Qt WebKit C++ classes are prefixed by @@ -199,6 +198,8 @@ connect(&page, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(authenticate(QNetworkReply*,QAuthenticator*))); \endcode + This also affects the way in which certificates are managed. For more information, see + \l {Managing Certificates}. \section1 Notes About Individual Methods |