Merge remote-tracking branch 'origin/5.12' into 5.13

* origin/5.12:
  39772d9 Fix static ip address showing after reconnection

Change-Id: I534bd8b4877893750fb902238bb8ff44394b8286

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;
             }