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/qnetworkaccessmanager.cpp | |
| 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/qnetworkaccessmanager.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index d925e77..bc01e82 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -711,9 +711,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // fourth step: setup the reply priv->setup(op, request, outgoingData); - if (request.attribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork).toInt() != - QNetworkRequest::AlwaysNetwork) - priv->setNetworkCache(d->networkCache); #ifndef QT_NO_NETWORKPROXY QList<QNetworkProxy> proxyList = d->queryProxy(QNetworkProxyQuery(request.url())); priv->proxyList = proxyList; |