diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:34:23 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-31 11:34:23 +0000 |
| commit | cf2d59bfe8720627e016195903e16cd0c97fa612 (patch) | |
| tree | 5cc0755d649d606867bf6168a091a91c9d3e6f3d /src/network | |
| parent | 7621bb0f3bba69e0b2849974a335dff4742c8e95 (diff) | |
| parent | 23c9d4c98f3c6729b56700edc1d7144b444b16db (diff) | |
Merge "Merge branch '5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/network')
| -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 c2b388bbce..57529761ee 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -664,10 +664,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 { @@ -683,9 +683,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) |