summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-12-15 23:00:14 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-12-15 23:00:14 (GMT)
commitea97637bbdb8a2cab2273b68668b3cad8cf0dfd0 (patch)
tree8d46055747dab2dc8b3fe80453704c3a5d5a1c76 /examples
parent5da4cd2d40a5217e0db1d2c04b6a3e06d486cb36 (diff)
parent540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b (diff)
downloadQt-ea97637bbdb8a2cab2273b68668b3cad8cf0dfd0.zip
Qt-ea97637bbdb8a2cab2273b68668b3cad8cf0dfd0.tar.gz
Qt-ea97637bbdb8a2cab2273b68668b3cad8cf0dfd0.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
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);
}