summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/module_config.yaml1
-rw-r--r--dependencies.yaml4
-rw-r--r--src/networksettings/connman/connman_manager.xml2
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.cpp14
4 files changed, 16 insertions, 5 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 15841e7..cf4c0ce 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,4 +1,5 @@
version: 2
+tags: ["documentation"]
accept_configuration:
condition: or
conditions:
diff --git a/dependencies.yaml b/dependencies.yaml
index 4ea1622..1530ff5 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
dependencies:
../../qt/qtdeclarative:
- ref: 1d49d4be2af0a8ef3608e607253557c008a2029d
+ ref: 5595809245cfedeb86657277b8354f45ddda2528
required: true
../qttools:
- ref: f87139beca54c8fd8ddbafb1004351e94bd969ce
+ ref: dc5fd0c416148e1de89c486e48c3b3f7e616ad17
required: false
diff --git a/src/networksettings/connman/connman_manager.xml b/src/networksettings/connman/connman_manager.xml
index 95bc0cb..ba95e8b 100644
--- a/src/networksettings/connman/connman_manager.xml
+++ b/src/networksettings/connman/connman_manager.xml
@@ -80,7 +80,7 @@
<signal name="TechnologyAdded" tp:name-for-bindings="Technology_Added">
<arg name="technology" type="o"/>
<arg name="properties" type="a{sv}"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
</signal>
<signal name="TechnologyRemoved" tp:name-for-bindings="Technology_Removed">
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
}