summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-16 00:25:34 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-16 00:25:34 (GMT)
commit4b47b11f2c504961d7d4dff164c3f015f4bd9445 (patch)
tree63bd8fe6aa49822f6287a0d6fae057aa8770a62b /src/network
parent6ade9920551f16154dda548041b5ba7bbddf78eb (diff)
downloadQt-4b47b11f2c504961d7d4dff164c3f015f4bd9445.zip
Qt-4b47b11f2c504961d7d4dff164c3f015f4bd9445.tar.gz
Qt-4b47b11f2c504961d7d4dff164c3f015f4bd9445.tar.bz2
Don't block forever if no bearer plugins are loaded.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/bearer/qnetworkconfigmanager_p.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp
index bc354c1..141d522 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.cpp
+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp
@@ -244,6 +244,11 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
void QNetworkConfigurationManagerPrivate::performAsyncConfigurationUpdate()
{
+ if (sessionEngines.isEmpty()) {
+ emit configurationUpdateComplete();
+ return;
+ }
+
updating = true;
for (int i = 0; i < sessionEngines.count(); ++i) {