summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-12-20 03:55:03 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-12-20 03:55:03 (GMT)
commit00fcb5e473e93546f999e45c78ed940b4d4caeeb (patch)
treeb84b34de6446e5a5f191fa5a501c63f7106d168a /examples
parent3fe6eab1e6e451457b9c060b6b643b86d3f82557 (diff)
parent95b0418a7ee7aee9658fd19b363e73d583af0b04 (diff)
downloadQt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.zip
Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.gz
Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'examples')
-rw-r--r--examples/network/bearermonitor/bearermonitor.cpp2
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);
}