diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:37:46 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:38:11 +0200 |
| commit | 8ab25620d3df25c43011ae982f4614639578afb3 (patch) | |
| tree | e94d53c6b7d231ca18f0787a0c09bec07d163a67 /src/network/access/qnetworkaccesscachebackend.cpp | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
| parent | 5222abfdf5f034bad12bbe12312a4149550495b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/network/socket/qnativesocketengine_unix.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191
Diffstat (limited to 'src/network/access/qnetworkaccesscachebackend.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccesscachebackend.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp index 86b544052d..0a9702d32b 100644 --- a/src/network/access/qnetworkaccesscachebackend.cpp +++ b/src/network/access/qnetworkaccesscachebackend.cpp @@ -44,7 +44,6 @@ QT_BEGIN_NAMESPACE QNetworkAccessCacheBackend::QNetworkAccessCacheBackend() : QNetworkAccessBackend() - , device(0) { } @@ -117,11 +116,6 @@ bool QNetworkAccessCacheBackend::sendCacheContents() void QNetworkAccessCacheBackend::closeDownstreamChannel() { - if (operation() == QNetworkAccessManager::GetOperation) { - device->close(); - delete device; - device = 0; - } } void QNetworkAccessCacheBackend::closeUpstreamChannel() |