diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 00:56:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 00:56:50 (GMT) |
| commit | 864f6ce803b50740bf493092f939808e9e0a0c61 (patch) | |
| tree | f45c1cd1f5282d617c850263af60064fd52e18c4 /src/plugins | |
| parent | 9f9ac102bd7b492c6801841eee607130bff51d64 (diff) | |
| parent | b001e886b35d06ca2551709280f0541cdc75c34a (diff) | |
| download | Qt-864f6ce803b50740bf493092f939808e9e0a0c61.zip Qt-864f6ce803b50740bf493092f939808e9e0a0c61.tar.gz Qt-864f6ce803b50740bf493092f939808e9e0a0c61.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the state of default network configuration.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/icd/qnetworksession_impl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index f08d8bf..a99c0a7 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -183,6 +183,12 @@ void QNetworkSessionPrivateImpl::updateState(QNetworkSession::State newState) icdConfig->mutex.lock(); icdConfig->state = QNetworkConfiguration::Defined; icdConfig->mutex.unlock(); + + // Reset the state of the default configuration to Discovered + icdConfig = toIcdConfig(privateConfiguration(publicConfig)); + icdConfig->mutex.lock(); + icdConfig->state = QNetworkConfiguration::Discovered; + icdConfig->mutex.unlock(); } else { if (!activeConfig.isValid()) { // Active configuration (IAP) was removed from system |