summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-02 03:15:54 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-02 03:23:08 (GMT)
commit7db513d4bbc55cc398e1434b5121e2f1408f9baa (patch)
treec2718e2f23d2e1d12885803db7502d30e8dc095b /src
parent1636e03a2fda5108cb4389689a327e65c47dfe0e (diff)
downloadQt-7db513d4bbc55cc398e1434b5121e2f1408f9baa.zip
Qt-7db513d4bbc55cc398e1434b5121e2f1408f9baa.tar.gz
Qt-7db513d4bbc55cc398e1434b5121e2f1408f9baa.tar.bz2
Abort if connection to DBus cannot be established.
Fixes network access issue when running Qt applications in scratchbox environment. Task-number: QT-3528
Diffstat (limited to 'src')
-rw-r--r--src/plugins/bearer/icd/qicdengine.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index 9d1bfab..0638a36 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -251,6 +251,11 @@ void QIcdEngine::initialize()
ICD_DBUS_API_INTERFACE,
QDBusConnection::systemBus(),
this);
+
+ // abort if cannot connect to DBus.
+ if (!m_dbusInterface->isValid())
+ return;
+
connect(&m_scanTimer, SIGNAL(timeout()), this, SLOT(finishAsyncConfigurationUpdate()));
m_scanTimer.setSingleShot(true);