diff options
author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-20 17:02:41 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:28:40 +0100 |
commit | 3f91cde588ad32277ba06d625ed36256ec65f88e (patch) | |
tree | 6e8a7692743cf64cd77721f466558a7180dae3a3 /src/network/access/qhttpnetworkconnectionchannel_p.h | |
parent | 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b (diff) |
Test for QT_NO_SSL instead of QT_NO_OPENSSL
Change the ifdefs in our own code (except openssl backend) to use the
new configure flag.
Change-Id: I8774734771c66b22164b5fae8fdb27814ac3df7b
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
-rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 1198ec9941..7da9b514d6 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -69,7 +69,7 @@ #ifndef QT_NO_HTTP -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL # include <QtNetwork/qsslsocket.h> # include <QtNetwork/qsslerror.h> #else @@ -115,7 +115,7 @@ public: QAuthenticator proxyAuthenticator; bool authenticationCredentialsSent; bool proxyCredentialsSent; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL bool ignoreAllSslErrors; QList<QSslError> ignoreSslErrorsList; #endif @@ -177,7 +177,7 @@ public: void _q_uploadDataReadyRead(); -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void _q_encrypted(); // start sending request (https) void _q_sslErrors(const QList<QSslError> &errors); // ssl errors from the socket void _q_encryptedBytesWritten(qint64 bytes); // proceed sending |