summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-06-14 11:49:26 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-06-16 07:07:28 +0000
commitdf6d3709a442591b286ceb47a3fd984a16da5d8b (patch)
treeb185bbe3bf80109594eefcaabf6187d8c63f5d16
parented581090eaf6f6d683fc70852b3b1c573e4f6aaf (diff)
downloadqtwebengine-df6d3709a442591b286ceb47a3fd984a16da5d8b.tar.gz
Doc: Add canceling authentication to porting instructions
It has changed from how it was done in Qt WebKit. The following sentence needs to be changed, because "this" no longer refers to the correct thing. Task-number: QTBUG-53849 Change-Id: I11be382c92a4ab729585d334a4f3c0abe46bb3e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc
index 96b33c9ca..c21a58d73 100644
--- a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc
+++ b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc
@@ -207,7 +207,15 @@
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
+ \note In Qt WebEngine, the QAuthenticator must be explicitly set to null to
+ cancel authentication:
+
+ \code
+ *authenticator = QAuthenticator();
+ \endcode
+
+ Omitting the \c QNetworkAccessManager also affects the way in which
+ certificates are managed. For more information, see
\l {Managing Certificates}.
\section1 Notes About Individual Methods