diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 14:24:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 14:24:28 +0200 |
| commit | 2064bf6155fda203fe798166e40be9247a20da85 (patch) | |
| tree | 7b4166afcba07a471cd89bfbedc15e51edfeffdc /src/plugins/bearer | |
| parent | 0127962e4772d6c758b954b2fe1d4b676d366b4c (diff) | |
| parent | 508b95899d4764d879a01b3990e44ce849cd9abc (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 2d8b9be092..554ad26e51 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -419,6 +419,8 @@ QCoreWlanEngine::QCoreWlanEngine(QObject *parent) QCoreWlanEngine::~QCoreWlanEngine() { + scanThread->wait(5000); + while (!foundConfigurations.isEmpty()) delete foundConfigurations.takeFirst(); [listener remove]; diff --git a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm index 057aec5487..ba1cf33258 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm @@ -404,6 +404,8 @@ QCoreWlanEngine::QCoreWlanEngine(QObject *parent) QCoreWlanEngine::~QCoreWlanEngine() { + scanThread->wait(5000); + while (!foundConfigurations.isEmpty()) delete foundConfigurations.takeFirst(); [listener remove]; |