summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-10-09 10:20:13 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-10-09 10:21:15 +0300
commit0c9a5da209d684c4863edecb9477b6323d3daca9 (patch)
tree0ee65b8e0e8b98a2be45ba2a4c7b2897947b10df
parent3647eb9695f1f09e41e712eb6a7fa55cdda5dd1d (diff)
parentfad870b6e606d44aeb8475c2c6ec33d4c21ec752 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
* origin/5.13: fad870b Merge remote-tracking branch 'origin/5.12' into 5.13 39772d9 Fix static ip address showing after reconnection Change-Id: I48a3f8ef1c787c37ae9c1fa0373ef9c797fd21df
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index 73ae3d4..5bea9e2 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -242,7 +242,7 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan
foreach (ConnmanMapStruct map, changed) {
bool found = false;
foreach (QNetworkSettingsService* service, m_serviceModel->getModel()) {
- if (service->id() == map.objectPath.path()) {
+ if (service->id() == map.objectPath.path() && service->placeholderState() == false) {
found =true;
break;
}