diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 16:36:14 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 16:36:14 (GMT) |
| commit | e4804c5d3d2e80cc7f57936591374d29478dbb2a (patch) | |
| tree | 76a85948ed5db925fda81028169e8dcde23b52b4 /src/network/access/qnetworkreplyimpl_p.h | |
| parent | fc4c4071d6e5704e84a5cca4ae22548bedb7b19d (diff) | |
| parent | b2e91ecd641b9c891ea823cfc647f729af6228e8 (diff) | |
| download | Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.zip Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.tar.gz Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/network/access/qnetworkaccessbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
Diffstat (limited to 'src/network/access/qnetworkreplyimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyimpl_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 8cda7a4..04f8aa8 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -131,7 +131,6 @@ public: void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData); - void setNetworkCache(QAbstractNetworkCache *networkCache); void pauseNotificationHandling(); void resumeNotificationHandling(); @@ -160,7 +159,7 @@ public: QIODevice *outgoingData; QRingBuffer *outgoingDataBuffer; QIODevice *copyDevice; - QAbstractNetworkCache *networkCache; + QAbstractNetworkCache *networkCache() const; bool cacheEnabled; QIODevice *cacheSaveDevice; |