diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-22 07:28:34 +0200 |
commit | 50908f023d83257dbc0b6d17bfe29e2f101615af (patch) | |
tree | de68e2d9587db1fb59d75505981b6ff033e12992 /src/plugins/bearer | |
parent | 7555a925816e3244073803f0adc4d44640f5ac1d (diff) | |
parent | d10e4c193b0152350e884adcc1060aabd1a974f7 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/platforms/ios/qiosviewcontroller.mm
Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index bc89f540fc..55eec57270 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -252,6 +252,8 @@ QStringList QConnmanManagerInterface::getServices() bool QConnmanManagerInterface::requestScan(const QString &type) { bool scanned = false; + if (technologiesMap.isEmpty()) + getTechnologies(); Q_FOREACH (QConnmanTechnologyInterface *tech, technologiesMap) { if (tech->type() == type) { tech->scan(); |