summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2011-02-19 12:53:41 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2011-02-20 08:12:30 (GMT)
commitd6e509936358141b1fef93852edd10b3b324ec5b (patch)
tree4d1ce72a599325484fd2af1a15451548bd2dcb8c
parent7b6b9201bdc6435aaa50370c8cf511e47f6e630d (diff)
downloadQt-d6e509936358141b1fef93852edd10b3b324ec5b.zip
Qt-d6e509936358141b1fef93852edd10b3b324ec5b.tar.gz
Qt-d6e509936358141b1fef93852edd10b3b324ec5b.tar.bz2
Doc: setSslConfiguration also sets the CA certificates
-rw-r--r--src/network/access/qnetworkrequest.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 89f7d44..7eec24e 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -529,8 +529,9 @@ QSslConfiguration QNetworkRequest::sslConfiguration() const
/*!
Sets this network request's SSL configuration to be \a config. The
settings that apply are the private key, the local certificate,
- the SSL protocol (SSLv2, SSLv3, TLSv1 where applicable) and the
- ciphers that the SSL backend is allowed to use.
+ the SSL protocol (SSLv2, SSLv3, TLSv1 where applicable), the CA
+ certificates and the ciphers that the SSL backend is allowed to
+ use.
By default, no SSL configuration is set, which allows the backends
to choose freely what configuration is best for them.