diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 04:59:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 04:59:04 (GMT) |
commit | c01231089fe396689310f56529d06ab4136296fa (patch) | |
tree | a74509eb83d5eaaab6194410134084e516e9b550 /examples | |
parent | 466b1db5f5466469bf3a62bb1d10da909aa07bac (diff) | |
parent | 6c1050611c91a88cdeaf62efe581c477873db2dc (diff) | |
download | Qt-c01231089fe396689310f56529d06ab4136296fa.zip Qt-c01231089fe396689310f56529d06ab4136296fa.tar.gz Qt-c01231089fe396689310f56529d06ab4136296fa.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:
Ensure that DBus is connected before all uses.
Fix invalid configurations being added to bearermonitor list.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/bearermonitor/bearermonitor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 75ffb01..bfa3d1f 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -226,7 +226,7 @@ void BearerMonitor::updateConfigurations() if (defaultConfiguration.type() == QNetworkConfiguration::ServiceNetwork) updateSnapConfiguration(defaultItem, defaultConfiguration); - } else { + } else if (defaultConfiguration.isValid()) { configurationAdded(defaultConfiguration); } |