diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 13:49:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 13:49:21 (GMT) |
| commit | a74b598cda82e9bddfe3f4613a7acc04f37bdd2d (patch) | |
| tree | c414da00b44beecf23926782ceb988346087b34c /src | |
| parent | fe7c8626af168ca29fd74930b9baa16c6dacdc30 (diff) | |
| parent | a5e5f9925e7f945e6b95452662be6981b41adecb (diff) | |
| download | Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.zip Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.tar.gz Qt-a74b598cda82e9bddfe3f4613a7acc04f37bdd2d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QHostInfo: Forgot to free some stuff on application exit.
Readd a line that got removed by accident in previous change
Ensure that a library path with a space in it gets quoted on Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 9de499e..b23f6db 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -451,6 +451,11 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was QHostInfoLookupManager::~QHostInfoLookupManager() { wasDeleted = true; + + // don't qDeleteAll currentLookups, the QThreadPool has ownership + qDeleteAll(postponedLookups); + qDeleteAll(scheduledLookups); + qDeleteAll(finishedLookups); } void QHostInfoLookupManager::work() |