summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkreply.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2019-11-01 10:58:24 +0100
committerFriedemann Kleint <[email protected]>2019-11-01 20:13:54 +0100
commit5436a6f3e0a9e7ef7ed51fc5b304e1f81eaed960 (patch)
treeebef0eaf87e8442e49c1db940b44a9a8fe03bdb5 /src/network/access/qnetworkreply.cpp
parentefaa4aa2a1452cf73bc3117c49d1345a4106fd57 (diff)
QNetworkReply: Fix SSL configuration handling
Use QT_CONFIG consistently and enclose sslConfigurationImplementation(), setSslConfigurationImplementation() and ignoreSslErrorsImplementation() within QT_CONFIG as well. This enables a build of Qt for Python with -no-feature-ssl. Change-Id: Ia699293ab73a5dc86d8dcf95aa5f6369334d36a2 Reviewed-by: MÃ¥rten Nordheim <[email protected]>
Diffstat (limited to 'src/network/access/qnetworkreply.cpp')
-rw-r--r--src/network/access/qnetworkreply.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index aca9cb1c084..fb30bfd4f18 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -687,7 +687,7 @@ QVariant QNetworkReply::attribute(QNetworkRequest::Attribute code) const
return d_func()->attributes.value(code);
}
-#ifndef QT_NO_SSL
+#if QT_CONFIG(ssl)
/*!
Returns the SSL configuration and state associated with this
reply, if SSL was used. It will contain the remote server's
@@ -742,7 +742,6 @@ void QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors)
{
ignoreSslErrorsImplementation(errors);
}
-#endif
/*!
\fn void QNetworkReply::sslConfigurationImplementation(QSslConfiguration &configuration) const
@@ -786,6 +785,8 @@ void QNetworkReply::ignoreSslErrorsImplementation(const QList<QSslError> &)
{
}
+#endif // QT_CONFIG(ssl)
+
/*!
If this function is called, SSL errors related to network
connection will be ignored, including certificate validation