From 801a0cc7ace9a1d980900537dffb50774cde03f7 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 20 Jul 2018 09:56:58 +0200 Subject: 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 --- src/network/access/qnetworkrequest.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/network/access/qnetworkrequest.cpp') 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) -- cgit v1.2.3