diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-08-30 18:52:51 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-08-31 09:47:41 +0000 |
| commit | 0ecd391912f6338d5aef6105600fc8c321c83bd8 (patch) | |
| tree | 50f3976e3d9fc7752a08b081aea0b3d09d1603d7 /src/networksettings/connman/qnetworksettingsservice_p.cpp | |
| parent | 27ac1af572dc9b17d4283b225b6c73b13f758546 (diff) | |
Fix ip address tracking and display
Task-number: QTBUG-69814
Change-Id: Ifc90871c11aeddd1d07c5f1feb2a4292f0d36463
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 65b663a9be5d27cbb77b48f9e392c9463416383a)
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsservice_p.cpp')
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index 65653aa..ec53956 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -400,9 +400,9 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV oldState.setState(m_state.state()); value >> m_state; emit q->stateChanged(); - if (m_state.state() == QNetworkSettingsState::Ready && m_type.type() == QNetworkSettingsType::Wifi) + if (m_state.state() == QNetworkSettingsState::Ready || m_state.state() == QNetworkSettingsState::Online) emit q->serviceConnected(q); - if (m_state.state() == QNetworkSettingsState::Disconnect && m_type.type() == QNetworkSettingsType::Wifi) + if (m_state.state() == QNetworkSettingsState::Disconnect) emit q->serviceDisconnected(q); } else if (key == PropertyName) { @@ -413,9 +413,9 @@ void QNetworkSettingsServicePrivate::updateProperty(const QString& key, const QV QString value = qdbus_cast<QString>(val); value >> m_type; emit q->typeChanged(); - if (m_state.state() == QNetworkSettingsState::Ready && m_type.type() == QNetworkSettingsType::Wifi) + if (m_state.state() == QNetworkSettingsState::Ready || m_state.state() == QNetworkSettingsState::Online) emit q->serviceConnected(q); - if (m_state.state() == QNetworkSettingsState::Disconnect && m_type.type() == QNetworkSettingsType::Wifi) + if (m_state.state() == QNetworkSettingsState::Disconnect) emit q->serviceDisconnected(q); } else if (key == PropertyStrength) { |