AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkRequest - fix the documentation

Browse Source 
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>
This commit is contained in:
Timur Pocheptsov 2018-07-20 09:56:58 +02:00
parent f861109ef3
commit 801a0cc7ac
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/access/qnetworkrequest.cpp
View File

@ -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)