summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-23 05:20:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-23 05:20:39 (GMT)
commit33f0f832a243ee2cb188fcf27126bde6c6c883b0 (patch)
treebf0b5cd2e8bc84d68b2795d1bd0b93bdf5476683 /src/plugins
parentce26bb60b46bb591f0cd3314abe4b18059c5c0ff (diff)
parent660f752c4db544d6fc5f827589d2f2704684eb8c (diff)
downloadQt-33f0f832a243ee2cb188fcf27126bde6c6c883b0.zip
Qt-33f0f832a243ee2cb188fcf27126bde6c6c883b0.tar.gz
Qt-33f0f832a243ee2cb188fcf27126bde6c6c883b0.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: add gsm to connectable bearer for networkmanager.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 30d6b50..6b37b38 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -213,6 +213,11 @@ void QNetworkManagerEngine::connectToId(const QString &id)
dbusDevicePath = devicePath.path();
break;
}
+ else if (device.deviceType() == DEVICE_TYPE_GSM &&
+ connectionType == QLatin1String("gsm")) {
+ dbusDevicePath = devicePath.path();
+ break;
+ }
}
const QString service = connection->connectionInterface()->service();