Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

2 files changed, 7 insertions, 0 deletions

diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index c793e52..79be2ce 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -929,6 +929,7 @@ void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg)
 
                 configLocker.unlock();
                 locker.unlock();
+                emit iapStateChanged(iapid, icd_connection_state);
                 emit configurationChanged(ptr);
                 locker.relock();
 
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