diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 23:35:51 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-05 23:35:51 (GMT) |
| commit | 4ef1103e6b399cb9421fb001f81af47bca20d2a7 (patch) | |
| tree | 632a5c65fb6ef43bc03639e1599d22651f668414 /src/plugins/bearer | |
| parent | c9a68d0c2b83d67359d153e0323b10147ef9b2e0 (diff) | |
| download | Qt-4ef1103e6b399cb9421fb001f81af47bca20d2a7.zip Qt-4ef1103e6b399cb9421fb001f81af47bca20d2a7.tar.gz Qt-4ef1103e6b399cb9421fb001f81af47bca20d2a7.tar.bz2 | |
Fix failure on Windows after merge.
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/nla/qnlaengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp index be1cd28..51897f0 100644 --- a/src/plugins/bearer/nla/qnlaengine.cpp +++ b/src/plugins/bearer/nla/qnlaengine.cpp @@ -406,8 +406,6 @@ QNetworkConfigurationPrivate *QNlaThread::parseQuerySet(const WSAQUERYSET *query cpPriv->id = QString::number(qHash(QLatin1String("NLA:") + cpPriv->name)); cpPriv->state = QNetworkConfiguration::Defined; cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - if (QNlaEngine *engine = qobject_cast<QNlaEngine *>(parent())) - config->bearer = engine->bearerName(config->id); #ifdef BEARER_MANAGEMENT_DEBUG qDebug() << "size:" << querySet->dwSize; @@ -443,6 +441,9 @@ QNetworkConfigurationPrivate *QNlaThread::parseQuerySet(const WSAQUERYSET *query } while (offset != 0 && offset < querySet->lpBlob->cbSize); } + if (QNlaEngine *engine = qobject_cast<QNlaEngine *>(parent())) + cpPriv->bearer = engine->bearerName(cpPriv->id); + return cpPriv; } |