diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-07-20 09:56:58 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-07-20 13:27:42 +0000 |
| commit | 801a0cc7ace9a1d980900537dffb50774cde03f7 (patch) | |
| tree | 0e243f5dbde0c8d787774d81329c6458cb0a9831 /src/network/access/qnetworkrequest.cpp | |
| parent | f861109ef32a669bc6edc3a2ba241fd731ccdfe7 (diff) | |
QNetworkRequest - fix the documentation
The wording was quite confusing and misleading - if not set exlicitly,
QNetworkRequest::sslConfiguration() will initialize configuration to
be equivalent of QSslConfiguration::defaultConfiguration(), not what
the documentation stated.
Task-number: QTBUG-13418
Change-Id: Id578db47ec75031376f73db42108053655fbf5c3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
| -rw-r--r-- | src/network/access/qnetworkrequest.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 9ce2128ead..2fc50a66de 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -645,10 +645,10 @@ void QNetworkRequest::setAttribute(Attribute code, const QVariant &value) #ifndef QT_NO_SSL /*! - Returns this network request's SSL configuration. By default, no - SSL settings are specified. + Returns this network request's SSL configuration. By default this is the same + as QSslConfiguration::defaultConfiguration(). - \sa setSslConfiguration() + \sa setSslConfiguration(), QSslConfiguration::defaultConfiguration() */ QSslConfiguration QNetworkRequest::sslConfiguration() const { @@ -664,9 +664,6 @@ QSslConfiguration QNetworkRequest::sslConfiguration() const 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. - \sa sslConfiguration(), QSslConfiguration::defaultConfiguration() */ void QNetworkRequest::setSslConfiguration(const QSslConfiguration &config) |