From f964de82d506a379b9d80b18025491aa3521a2c9 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Wed, 27 Oct 2010 17:14:03 +0200
Subject: QNAM: fix build

* winsock2.h conflicts with qplatformdefs.h
* ifndef QT_NO_OPENSSL was missing

Reviewed-by: Prasanth
Reviewed-by: Markus Goetz
---
 src/network/access/qhttpnetworkconnection.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 92f8af7..c335cd4 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
-- 
cgit v0.12