Skip to content
GitLab
Commit bb13e930 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.11' into dev 

Change-Id: I22c4d4be2d1b38bb576d1ae674cb19880d1ed9c9
parents af5404a2 4e080dcb
dev 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 6.2.0 6.2.1 6.2.2 wip/cmake wip/qt6 v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 2 deletions
src/multimedia/audio/qsamplecache_p.cpp
+ 1
− 2
View file @ bb13e930
......@@ -132,8 +132,7 @@ QSampleCache::~QSampleCache()
for (QSample* sample : copyStaleSamples)
delete sample;
if (m_networkAccessManager)
m_networkAccessManager->deleteLater();
delete m_networkAccessManager;
}
void QSampleCache::loadingRelease()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment