summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMartin Petersson <Martin.Petersson@nokia.com>2012-05-22 08:37:05 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-05-22 09:55:08 (GMT)
commit3484489af72c0cad3fac28f7c8b953c32e6feb9a (patch)
tree664664f57ba249336f6bf992e0559fbc2edd96ec /src/network
parent11a1383d54fd479c4fb3d2a96b847732a01dcce8 (diff)
downloadQt-3484489af72c0cad3fac28f7c8b953c32e6feb9a.zip
Qt-3484489af72c0cad3fac28f7c8b953c32e6feb9a.tar.gz
Qt-3484489af72c0cad3fac28f7c8b953c32e6feb9a.tar.bz2
QNetwork: fix compilation with no openssl
Change-Id: Id637dd1155c46ffc75563812b8c9d5f062e76e22 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 52dfc65..58e7bcc 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -1080,7 +1080,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
// in memory and we will not recieve more data on the socket.
reply->setReadBufferSize(0);
_q_receiveReply();
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
if (ssl) {
// QT_NO_OPENSSL. The QSslSocket can still have encrypted bytes in the plainsocket.
// So we need to check this if the socket is a QSslSocket. When the socket is flushed