diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2010-10-27 17:14:03 +0200 |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2010-10-27 17:19:05 +0200 |
| commit | f964de82d506a379b9d80b18025491aa3521a2c9 (patch) | |
| tree | ccb0ef83fb766a278ee9b90a05547300e7d7a724 /src/network/access/qhttpnetworkconnection.cpp | |
| parent | b5d9dbf28b78aa17bfb70aa2e5fd3da99fe53ff0 (diff) | |
| download | qt4-tools-f964de82d506a379b9d80b18025491aa3521a2c9.tar.gz | |
QNAM: fix build
* winsock2.h conflicts with qplatformdefs.h
* ifndef QT_NO_OPENSSL was missing
Reviewed-by: Prasanth
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 92f8af7718..c335cd4d07 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ +#include <private/qabstractsocket_p.h> #include "qhttpnetworkconnection_p.h" #include "qhttpnetworkconnectionchannel_p.h" #include "private/qnoncontiguousbytedevice_p.h" #include <private/qnetworkrequest_p.h> #include <private/qobject_p.h> #include <private/qauthenticator_p.h> -#include <private/qabstractsocket_p.h> #include <qnetworkproxy.h> #include <qauthenticator.h> @@ -129,9 +129,11 @@ void QHttpNetworkConnectionPrivate::pauseConnection() // Disable all socket notifiers for (int i = 0; i < channelCount; i++) { +#ifndef QT_NO_OPENSSL if (encrypt) QSslSocketPrivate::pauseSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket)); else +#endif QAbstractSocketPrivate::pauseSocketNotifiers(channels[i].socket); } } @@ -141,9 +143,11 @@ void QHttpNetworkConnectionPrivate::resumeConnection() state = RunningState; // Enable all socket notifiers for (int i = 0; i < channelCount; i++) { +#ifndef QT_NO_OPENSSL if (encrypt) QSslSocketPrivate::resumeSocketNotifiers(static_cast<QSslSocket*>(channels[i].socket)); else +#endif QAbstractSocketPrivate::resumeSocketNotifiers(channels[i].socket); // Resume pending upload if needed |