diff options
author | Benjamin C Meyer <ben@meyerhome.net> | 2009-09-01 07:51:56 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 08:32:11 (GMT) |
commit | 925912ebf552417306a5bd20fd986afda6a582be (patch) | |
tree | d459905a04f1540fef8569d03417647c95a98ef4 /src/network/access/qnetworkreplyimpl_p.h | |
parent | 63e2f5d2c95ece21fd32d0690022b89c38fee865 (diff) | |
download | Qt-925912ebf552417306a5bd20fd986afda6a582be.zip Qt-925912ebf552417306a5bd20fd986afda6a582be.tar.gz Qt-925912ebf552417306a5bd20fd986afda6a582be.tar.bz2 |
QNetworkAccessManager can delete the QAbstractNetworkCache pointer at
any point. Rather then keep a separate pointer to the cache in the
reply use the pointer kept by the manager so the reply never tries
to access a cache pointer that has already been deleted.
Autotest: included
Merge-request: 1124
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
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 0accaab..f723b7f 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -128,7 +128,6 @@ public: void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData); - void setNetworkCache(QAbstractNetworkCache *networkCache); void pauseNotificationHandling(); void resumeNotificationHandling(); @@ -153,7 +152,7 @@ public: QNetworkAccessBackend *backend; QIODevice *outgoingData; QIODevice *copyDevice; - QAbstractNetworkCache *networkCache; + QAbstractNetworkCache *networkCache() const; bool cacheEnabled; QIODevice *cacheSaveDevice; |