diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-12 16:38:45 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-12 16:38:45 +0300 |
| commit | a0c731231a494599a4017e4d6dd7630710bda6a9 (patch) | |
| tree | 29e3debaa814cd99cf04513ee7b090929b0f6da5 | |
| parent | 84ba9394c0a8fdb8618eb7021c85271387a9956c (diff) | |
| parent | ea50d0f319991227eb0904532e26ca9ef354c711 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
Change-Id: I48619dc80e7ce0e6d62b62a495e8abcea864265d
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index b9c40d1..f6f7fed 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.6") +set(QT_REPO_MODULE_VERSION "6.2.7") diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index bc92f97..77bf66f 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -260,11 +260,21 @@ void QNetworkSettingsManagerPrivate::onServicesChanged(ConnmanMapStructList chan emit q->servicesChanged(); if (auto service = m_unnamedServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } if (auto service = m_unknownServices.take(path)) - if (!service->placeholderState()) + if (!service->placeholderState()) { + disconnect(service, &QNetworkSettingsService::nameChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); + disconnect(service, &QNetworkSettingsService::typeChanged, + this, &QNetworkSettingsManagerPrivate::serviceReady); service->deleteLater(); + } m_unnamedServicesForSsidConnection.remove(path); // do not delete here } |