diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2009-12-03 02:44:11 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2009-12-22 05:10:14 (GMT) |
| commit | 2374a4209f9edcc865b18f63e07a50cdaddc70b7 (patch) | |
| tree | 325f735e0b9ca4dc1fae7b25d4b436ea93ef7296 /src/network/bearer/qnetworkconfigmanager_p.cpp | |
| parent | c2254fdcba61c0aceb89f2f5e6dc926a9493c1a2 (diff) | |
| download | Qt-2374a4209f9edcc865b18f63e07a50cdaddc70b7.zip Qt-2374a4209f9edcc865b18f63e07a50cdaddc70b7.tar.gz Qt-2374a4209f9edcc865b18f63e07a50cdaddc70b7.tar.bz2 | |
Convert NLA engine nito a plugin.
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager_p.cpp')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp index 7b68394..c61bcd3 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.cpp +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp @@ -41,9 +41,6 @@ #include "qnetworkconfigmanager_p.h" -#ifdef Q_OS_WIN -#include "qnlaengine_win_p.h" -#endif #ifdef Q_OS_WIN32 #include "qnativewifiengine_win_p.h" #endif @@ -269,11 +266,17 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations() #endif #ifdef Q_OS_WIN - nla = QNlaEngine::instance(); - if (nla) { - connect(nla, SIGNAL(configurationsChanged()), - this, SLOT(updateConfigurations())); + if (keys.contains(QLatin1String("nla"))) { + QBearerEnginePlugin *nlaPlugin = + qobject_cast<QBearerEnginePlugin *>(l->instance(QLatin1String("nla"))); + if (nlaPlugin) { + nla = nlaPlugin->create(QLatin1String("nla")); + if (nla) { + connect(nla, SIGNAL(configurationsChanged()), + this, SLOT(updateConfigurations())); + } } + } #endif #ifdef Q_OS_WIN32 |