summaryrefslogtreecommitdiffstats
path: root/src/qt3support
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-08-05 08:57:13 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-08-05 10:20:23 (GMT)
commit5f52d473eec0f1b46200b06dd7f5e16cb5c57c05 (patch)
tree457d8aac9da14afe76f9f3bf0d5dc186aeb62259 /src/qt3support
parent118c82b0988c671045de448ffabc7ba95f015a69 (diff)
downloadQt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.zip
Qt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.tar.gz
Qt-5f52d473eec0f1b46200b06dd7f5e16cb5c57c05.tar.bz2
Fix compilation when QT_NO_HTTP is defined
Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
Diffstat (limited to 'src/qt3support')
-rw-r--r--src/qt3support/network/q3http.cpp2
-rw-r--r--src/qt3support/network/q3http.h5
-rw-r--r--src/qt3support/network/q3network.cpp2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index a38edad..e44dfe8 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -42,7 +42,7 @@
#include <qplatformdefs.h>
#include "q3http.h"
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef QT_NO_HTTP
#include "q3socket.h"
#include "qtextstream.h"
diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h
index 93ab00e..5311764 100644
--- a/src/qt3support/network/q3http.h
+++ b/src/qt3support/network/q3http.h
@@ -52,8 +52,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Qt3Support)
-
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef QT_NO_HTTP
class Q3Socket;
class QTimerEvent;
@@ -269,7 +268,7 @@ private:
friend class Q3HttpPGHRequest;
};
-#endif // QT_NO_NETWORKPROTOCOL_HTTP
+#endif // QT_NO_HTTP
QT_END_NAMESPACE
diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp
index 3a6a6f0..1f918d1 100644
--- a/src/qt3support/network/q3network.cpp
+++ b/src/qt3support/network/q3network.cpp
@@ -63,7 +63,7 @@ void q3InitNetworkProtocols()
#ifndef QT_NO_NETWORKPROTOCOL_FTP
Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("ftp"), new Q3NetworkProtocolFactory< Q3Ftp > );
#endif
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef QT_NO_HTTP
Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("http"), new Q3NetworkProtocolFactory< Q3Http > );
#endif
}