diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
commit | 2c6de1ce1489668253b7d3a5df3f2194fbd1bee7 (patch) | |
tree | 3e4298cdb45f9b60ac9b7bb27b5ec3bdbd540b2f /src/plugins/bearer/corewlan | |
parent | d042a00b5828961e1e1fa82017717b5f72dde9ef (diff) | |
parent | 82991e40afd46f91de42dec048df705441b6b0cf (diff) | |
download | Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.zip Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.gz Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.bz2 |
Merge remote branch 'staging/4.7' into HEAD
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
Diffstat (limited to 'src/plugins/bearer/corewlan')
-rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 4ab4d88..598d2f0 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -164,9 +164,9 @@ void QCoreWlanEngine::connectToId(const QString &id) NSDictionary *parametersDict; NSArray* apArray; - CW8021XProfile *user8021XProfile; - NSError *err; - NSMutableDictionary *params; + CW8021XProfile *user8021XProfile; + NSError *err; + NSMutableDictionary *params; while ((wProfile = [enumerator nextObject])) { //CWWirelessProfile @@ -431,12 +431,8 @@ QStringList QCoreWlanEngine::scanForSsids(const QString &interfaceName) } [looppool release]; } - } /*else { - qWarning() << "ERROR scanning for ssids" << nsstringToQString([err localizedDescription]) - <<nsstringToQString([err domain]); - }*/ + } } - [autoreleasepool drain]; #else Q_UNUSED(interfaceName); |