summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/connman/qconnmanengine.cpp
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@jollamobile.com>2013-10-18 05:29:25 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-11 03:30:52 +0100
commit1db89eb5a4cbe98d8380410de3acc527fc53f911 (patch)
tree6fcc431e0c62668cf3bd4a4fd525e25651b7cf32 /src/plugins/bearer/connman/qconnmanengine.cpp
parentc28763d83c493a11da90295ec4bde016c53c0d70 (diff)
fix connman QNetworkConfiguration Discovered
Make Discovered depend on autoconnectable service This stops seemingly automatic use of a non autconnectable service, and allows the connection dialog to popup. Change-Id: Idea9a22eb4bbfb4fefeca7867526a2ddc3954376 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/bearer/connman/qconnmanengine.cpp')
-rw-r--r--src/plugins/bearer/connman/qconnmanengine.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index be50ba9935..7633b4f2b8 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -416,21 +416,23 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
QMutexLocker locker(&mutex);
QConnmanServiceInterface serv(service);
QNetworkConfiguration::StateFlags flag = QNetworkConfiguration::Defined;
- if( serv.getType() == "cellular") {
- if(serv.isSetupRequired()) {
+ if (serv.getType() == "cellular") {
+ if (serv.isSetupRequired() || !serv.isAutoConnect()) {
flag = ( flag | QNetworkConfiguration::Defined);
} else {
flag = ( flag | QNetworkConfiguration::Discovered);
}
} else {
- if(serv.isFavorite()) {
- flag = ( flag | QNetworkConfiguration::Discovered);
+ if (serv.isFavorite()) {
+ if (serv.isAutoConnect()) {
+ flag = ( flag | QNetworkConfiguration::Discovered);
+ }
} else {
flag = QNetworkConfiguration::Undefined;
}
}
- if(serv.getState() == "ready" || serv.getState() == "online") {
+ if (serv.getState() == "ready" || serv.getState() == "online") {
flag = ( flag | QNetworkConfiguration::Active);
}