diff options
| author | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-10 13:18:56 (GMT) |
| commit | 34dd8163f4fcd16be5677fc94ce960cc464991d5 (patch) | |
| tree | f871fef42b4f337a98bce77ad307efe079b7dc5f /src/network/access | |
| parent | 0dfca6e13a7ad3cce38d5509d446f76eb496f398 (diff) | |
| parent | 70e098d965318651acb725374b73e026f2946b76 (diff) | |
| download | Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.zip Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.gz Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpnetworkheader.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 1 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkrequest.cpp | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkheader.cpp b/src/network/access/qhttpnetworkheader.cpp index 5af9764..88cc484 100644 --- a/src/network/access/qhttpnetworkheader.cpp +++ b/src/network/access/qhttpnetworkheader.cpp @@ -41,6 +41,7 @@ #include "qhttpnetworkheader_p.h" +#ifndef QT_NO_HTTP QT_BEGIN_NAMESPACE @@ -121,3 +122,5 @@ bool QHttpNetworkHeaderPrivate::operator==(const QHttpNetworkHeaderPrivate &othe QT_END_NAMESPACE + +#endif diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index fe49799..819aeb5 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -52,6 +52,7 @@ // // We mean it. // +#include <qplatformdefs.h> #ifndef QT_NO_HTTP #ifndef QT_NO_COMPRESS diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index 0f330af..b1db0b7 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -42,6 +42,8 @@ #include "qhttpnetworkrequest_p.h" #include "private/qnoncontiguousbytedevice_p.h" +#ifndef QT_NO_HTTP + QT_BEGIN_NAMESPACE QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op, @@ -260,3 +262,5 @@ int QHttpNetworkRequest::minorVersion() const QT_END_NAMESPACE +#endif + |