diff options
| author | Bill King <bill.king@nokia.com> | 2010-03-02 05:23:38 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2010-03-02 05:23:38 (GMT) |
| commit | a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19 (patch) | |
| tree | 6ad6e9236db0f5f3698c723ce0e214480c6946c0 /src | |
| parent | 618ca0234b626fc454f74b3d98bb8f82927c16e8 (diff) | |
| parent | 67971d081f3dd70f9aa0427bb41bd810f08020b4 (diff) | |
| download | Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.zip Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.tar.gz Qt-a6aaaff7d09e6a1bd5d09a4c15272bf25f53ac19.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
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() |