diff options
| author | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-03-24 16:49:27 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-03-25 10:55:50 (GMT) |
| commit | 6a1d87870a6e9374bc5157f16f29232180546dfa (patch) | |
| tree | c09c8f5de282f659d77c55612f4835d735597ac6 /src/network | |
| parent | 1e4402497124f7e2c51793a58f03c2b98512f256 (diff) | |
| download | Qt-6a1d87870a6e9374bc5157f16f29232180546dfa.zip Qt-6a1d87870a6e9374bc5157f16f29232180546dfa.tar.gz Qt-6a1d87870a6e9374bc5157f16f29232180546dfa.tar.bz2 | |
introduce QT_NO_NETWORKDISKCACHE
that was necessary because when defining QT_NO_TEMPORARYFILE there would
be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile.
Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL
license header.
Reviewed-by: Paul
Task-number: 248807
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkdiskcache.cpp | 4 | ||||
| -rw-r--r-- | src/network/access/qnetworkdiskcache.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index fa0fccb..e472b9d 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -41,6 +41,8 @@ //#define QNETWORKDISKCACHE_DEBUG +#ifndef QT_NO_NETWORKDISKCACHE + #include "qnetworkdiskcache.h" #include "qnetworkdiskcache_p.h" @@ -664,3 +666,5 @@ bool QCacheItem::read(QFile *device, bool readData) } QT_END_NAMESPACE + +#endif // QT_NO_NETWORKDISKCACHE diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index ca4bb94..78e3f6b 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Network) +#ifndef QT_NO_NETWORKDISKCACHE + class QNetworkDiskCachePrivate; class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache { @@ -86,9 +88,10 @@ private: Q_DISABLE_COPY(QNetworkDiskCache) }; +#endif // QT_NO_NETWORKDISKCACHE + QT_END_NAMESPACE QT_END_HEADER #endif // QNETWORKDISKCACHE_H - |