summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-03-18 13:58:51 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2010-03-31 12:14:15 (GMT)
commit670ef284a02e822fa244462e9e8126bc646dff5e (patch)
treed7f220bde6eeb6bffa8d560ca82912158508218b /src/network
parent27a110eb7238b8b8d72db968d813855a9c2afb08 (diff)
downloadQt-670ef284a02e822fa244462e9e8126bc646dff5e.zip
Qt-670ef284a02e822fa244462e9e8126bc646dff5e.tar.gz
Qt-670ef284a02e822fa244462e9e8126bc646dff5e.tar.bz2
Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork
Merge-request: 2332 Reviewed-by: Peter Hartmann
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qnetworkdiskcache.cpp3
-rw-r--r--src/network/access/qnetworkdiskcache_p.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index ec6817a..cce6bd9 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -41,7 +41,6 @@
//#define QNETWORKDISKCACHE_DEBUG
-#ifndef QT_NO_NETWORKDISKCACHE
#include "qnetworkdiskcache.h"
#include "qnetworkdiskcache_p.h"
@@ -60,6 +59,8 @@
#define CACHE_POSTFIX QLatin1String(".cache")
#define MAX_COMPRESSION_SIZE (1024 * 1024 * 3)
+#ifndef QT_NO_NETWORKDISKCACHE
+
QT_BEGIN_NAMESPACE
/*!
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index ad46602..b6df179 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -59,6 +59,8 @@
#include <qhash.h>
#include <qtemporaryfile.h>
+#ifndef QT_NO_NETWORKDISKCACHE
+
QT_BEGIN_NAMESPACE
class QFile;
@@ -119,4 +121,6 @@ public:
QT_END_NAMESPACE
+#endif // QT_NO_NETWORKDISKCACHE
+
#endif // QNETWORKDISKCACHE_P_H