diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-08 14:51:11 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-08 14:51:41 +0300 |
commit | fad870b6e606d44aeb8475c2c6ec33d4c21ec752 (patch) | |
tree | 771cd031e8fdeddfb6d1e1142b14efb2d77eb242 /src/networksettings/connman/qnetworksettingsmanager_p.cpp | |
parent | e9ac06074db9804fc5d717bcc4ae503b70616fe7 (diff) | |
parent | 39772d9da1bdb62142214a91f67027b5fb825869 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
39772d9 Fix static ip address showing after reconnection
Change-Id: I534bd8b4877893750fb902238bb8ff44394b8286
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.cpp')
-rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index 2f7965d..ffcef49 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -243,7 +243,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; } |