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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index b6b37db242..e4ea62f093 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -48,7 +48,7 @@ #ifndef QT_NO_HTTP -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL # include <QtNetwork/qsslkey.h> # include <QtNetwork/qsslcipher.h> # include <QtNetwork/qsslconfiguration.h> @@ -77,7 +77,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel() , proxyAuthMethod(QAuthenticatorPrivate::None) , authenticationCredentialsSent(false) , proxyCredentialsSent(false) -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL , ignoreAllSslErrors(false) #endif , pipeliningSupported(PipeliningSupportUnknown) @@ -90,7 +90,7 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel() void QHttpNetworkConnectionChannel::init() { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL if (connection->d_func()->encrypt) socket = new QSslSocket; else @@ -139,7 +139,7 @@ void QHttpNetworkConnectionChannel::init() Qt::DirectConnection); #endif -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket); if (sslSocket) { // won't be a sslSocket if encrypt is false @@ -257,7 +257,7 @@ bool QHttpNetworkConnectionChannel::sendRequest() const qint64 socketWriteMaxSize = 16*1024; -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket); // if it is really an ssl socket, check more than just bytesToWrite() while ((socket->bytesToWrite() + (sslSocket ? sslSocket->encryptedBytesToWrite() : 0)) @@ -598,7 +598,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection() } #endif if (ssl) { -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket); sslSocket->connectToHostEncrypted(connectHost, connectPort, QIODevice::ReadWrite, networkLayerPreference); if (ignoreAllSslErrors) @@ -1117,7 +1117,7 @@ void QHttpNetworkConnectionChannel::_q_uploadDataReadyRead() sendRequest(); } -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL void QHttpNetworkConnectionChannel::_q_encrypted() { if (!socket) |