Convert features.networkdiskcache to QT_[REQUIRE_]CONFIG
Change-Id: I8ba76ba1c7210169df14ffab7dabf4b4be086fb9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
c6b9c6e5f2
commit
d332a2d3cc
@ -31,8 +31,6 @@ HEADERS += \
|
||||
access/qnetworkreplyfileimpl_p.h \
|
||||
access/qabstractnetworkcache_p.h \
|
||||
access/qabstractnetworkcache.h \
|
||||
access/qnetworkdiskcache_p.h \
|
||||
access/qnetworkdiskcache.h \
|
||||
access/qhttpthreaddelegate_p.h \
|
||||
access/qhttpmultipart.h \
|
||||
access/qhttpmultipart_p.h \
|
||||
@ -66,7 +64,6 @@ SOURCES += \
|
||||
access/qnetworkreplyhttpimpl.cpp \
|
||||
access/qnetworkreplyfileimpl.cpp \
|
||||
access/qabstractnetworkcache.cpp \
|
||||
access/qnetworkdiskcache.cpp \
|
||||
access/qhttpthreaddelegate.cpp \
|
||||
access/qhttpmultipart.cpp \
|
||||
access/qnetworkfile.cpp \
|
||||
@ -84,6 +81,14 @@ qtConfig(ftp) {
|
||||
access/qnetworkaccessftpbackend.cpp
|
||||
}
|
||||
|
||||
qtConfig(networkdiskcache) {
|
||||
HEADERS += \
|
||||
access/qnetworkdiskcache_p.h \
|
||||
access/qnetworkdiskcache.h
|
||||
|
||||
SOURCES += access/qnetworkdiskcache.cpp
|
||||
}
|
||||
|
||||
mac: LIBS_PRIVATE += -framework Security
|
||||
|
||||
include($$PWD/../../3rdparty/zlib_dependency.pri)
|
||||
|
@ -60,8 +60,6 @@
|
||||
|
||||
#define MAX_COMPRESSION_SIZE (1024 * 1024 * 3)
|
||||
|
||||
#ifndef QT_NO_NETWORKDISKCACHE
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
@ -737,5 +735,3 @@ bool QCacheItem::read(QFile *device, bool readData)
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_NETWORKDISKCACHE
|
||||
|
@ -43,11 +43,10 @@
|
||||
#include <QtNetwork/qtnetworkglobal.h>
|
||||
#include <QtNetwork/qabstractnetworkcache.h>
|
||||
|
||||
QT_REQUIRE_CONFIG(networkdiskcache);
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
#ifndef QT_NO_NETWORKDISKCACHE
|
||||
|
||||
class QNetworkDiskCachePrivate;
|
||||
class Q_NETWORK_EXPORT QNetworkDiskCache : public QAbstractNetworkCache
|
||||
{
|
||||
@ -84,8 +83,6 @@ private:
|
||||
Q_DISABLE_COPY(QNetworkDiskCache)
|
||||
};
|
||||
|
||||
#endif // QT_NO_NETWORKDISKCACHE
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QNETWORKDISKCACHE_H
|
||||
|
@ -58,7 +58,7 @@
|
||||
#include <qhash.h>
|
||||
#include <qtemporaryfile.h>
|
||||
|
||||
#ifndef QT_NO_NETWORKDISKCACHE
|
||||
QT_REQUIRE_CONFIG(networkdiskcache);
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@ -123,6 +123,4 @@ public:
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_NETWORKDISKCACHE
|
||||
|
||||
#endif // QNETWORKDISKCACHE_P_H
|
||||
|
Loading…
x
Reference in New Issue
Block a user