diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-06 00:01:30 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-06 00:01:30 (GMT) |
| commit | 6cdcb06d6d8fb60f250aa0389e8d545d0d52fb79 (patch) | |
| tree | 24a9d806bdd3427dff16d5850047ee1290ead512 /src | |
| parent | f5459734441c102c9e8209fad8f0e6dff8377f7e (diff) | |
| download | Qt-6cdcb06d6d8fb60f250aa0389e8d545d0d52fb79.zip Qt-6cdcb06d6d8fb60f250aa0389e8d545d0d52fb79.tar.gz Qt-6cdcb06d6d8fb60f250aa0389e8d545d0d52fb79.tar.bz2 | |
Fix failures on Mac OS X after merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 3ceebbd..2a3fecf 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -306,6 +306,7 @@ void QCoreWlanEngine::doRequestUpdate() ptr->id = id; ptr->state = state; ptr->type = QNetworkConfiguration::InternetAccessPoint; + ptr->bearer = qGetInterfaceType(interface.name()); accessPointConfigurations.insert(id, ptr); configurationInterface.insert(id, interface.name()); @@ -345,6 +346,8 @@ QStringList QCoreWlanEngine::scanForSsids(const QString &interfaceName) apNetwork = [apArray objectAtIndex:row]; + const QString networkSsid = nsstringToQString([apNetwork ssid]); + const QString id = QString::number(qHash(QLatin1String("corewlan:") + networkSsid)); found.append(id); |