diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:05:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:05:33 (GMT) |
| commit | c09b481edd82942cdc85d138c2160004bd71a54e (patch) | |
| tree | b66f9772d73b61e61b001448f5567ed77055a389 /src/plugins | |
| parent | 5a4df38ac98aa013bcfaddc8470bc1a7bae4449e (diff) | |
| parent | df3691a0709af1706375772f5b68b0862ffb2d58 (diff) | |
| download | Qt-c09b481edd82942cdc85d138c2160004bd71a54e.zip Qt-c09b481edd82942cdc85d138c2160004bd71a54e.tar.gz Qt-c09b481edd82942cdc85d138c2160004bd71a54e.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
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 |