Fix compilation with QT_NO_*

Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
	src/declarative/debugger/qdeclarativedebugserver.cpp

Change-Id: I8ff647b1e331b0c855a8f63d16a4f3cacd8e436c
Reviewed-on: http://codereview.qt-project.org/4567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index d7eeb1c..9c361e0 100644 (file)
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -51,6 +51,7 @@
 #include "private/qnetworkaccesscache_p.h"
 #include "private/qnoncontiguousbytedevice_p.h"
 
+#ifndef QT_NO_HTTP
 
 QT_BEGIN_NAMESPACE
 
@@ -576,4 +577,6 @@ void  QHttpThreadDelegate::synchronousProxyAuthenticationRequiredSlot(const QNet
 
 #endif
 
+#endif // QT_NO_HTTP
+
 QT_END_NAMESPACE

diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
index 15c76b1..d97193d 100644 (file)
--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -68,6 +68,8 @@
 #include "private/qnoncontiguousbytedevice_p.h"
 #include "qnetworkaccessauthenticationmanager_p.h"
 
+#ifndef QT_NO_HTTP
+
 QT_BEGIN_NAMESPACE
 
 class QAuthenticator;
@@ -285,4 +287,6 @@ signals:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_HTTP
+
 #endif // QHTTPTHREADDELEGATE_H