summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-07 03:00:32 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-07 03:00:32 +0200
commitbb13e93058708eb59e9e6b4e6cdfdb65f618d1c8 (patch)
tree4a69abfaf5cdc5524f8545486321901b52498b37
parentaf5404a28aa10bfbec23905443132e6a9882dc79 (diff)
parent4e080dcbfc8b519b041f125c53ad5f7313ac5393 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
-rw-r--r--src/multimedia/audio/qsamplecache_p.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index 93010c182..43f948cef 100644
--- a/src/multimedia/audio/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
@@ -132,8 +132,7 @@ QSampleCache::~QSampleCache()
for (QSample* sample : copyStaleSamples)
delete sample;
- if (m_networkAccessManager)
- m_networkAccessManager->deleteLater();
+ delete m_networkAccessManager;
}
void QSampleCache::loadingRelease()