diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-06-27 16:27:09 +0300 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2017-06-29 12:36:31 +0000 |
commit | 99d54e264d8f783b7be22be1dd34e0cecc76dfb8 (patch) | |
tree | 59bf74864176b144b382c0063bb7377fc3982f3f /src/networksettings | |
parent | bf37396d2b4541d08b4670f190736443c73a65e6 (diff) |
Use both IPv4.Configuration and IPv4 for reading connman settings
Task-number: QTBUG-60979
Change-Id: Iac5659897391f2517704a8347c7ef8a77a6000e7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/networksettings')
-rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index 41f0aa0..49213c4 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -342,10 +342,19 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV { Q_Q(QNetworkSettingsService); - if (key == PropertyIPv4) { + if (key == PropertyQNetworkSettingsIPv4) { QVariantMap value = qdbus_cast<QVariantMap>(val); - value >> m_ipv4config; - emit q->ipv4Changed(); + if (value[PropertyMethod].toString() == AttributeManual) { + value >> m_ipv4config; + emit q->ipv4Changed(); + } + } + else if (key == PropertyIPv4) { + QVariantMap value = qdbus_cast<QVariantMap>(val); + if (value[PropertyMethod].toString() != AttributeManual) { + value >> m_ipv4config; + emit q->ipv4Changed(); + } } else if (key == PropertyIPv6) { QVariantMap value = qdbus_cast<QVariantMap>(val); |