diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /src/network/access/qnetworkrequest.cpp | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
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 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) |