diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-28 11:38:59 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-08-28 11:39:50 +0300 |
| commit | 010ca29d1eb902906b0005df7fb853dade60c778 (patch) | |
| tree | 8ba6f4776c83490a939112817f07b940f3a048c2 | |
| parent | ed38e9210f8408ec38502e0311e944915617e7c4 (diff) | |
| parent | 27ac1af572dc9b17d4283b225b6c73b13f758546 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
27ac1af Add missing powered property to NetworkInterface
041e4ef Remove extra servicesChanged signal emit
Change-Id: I457b71cf61195f52283109e5b0970b9f3839d437
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsmanager_p.cpp | 1 | ||||
| -rw-r--r-- | src/networksettings/qnetworksettingsinterfacemodel.cpp | 4 | ||||
| -rw-r--r-- | src/networksettings/qnetworksettingsinterfacemodel.h | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index ff792d9..cadcf6b 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -166,7 +166,6 @@ void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher const QString servicePath = object.objectPath.path(); handleNewService(servicePath); } - emit q->servicesChanged(); } void QNetworkSettingsManagerPrivate::getTechnologiesFinished(QDBusPendingCallWatcher *watcher) diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp index 8854d5f..72ea805 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.cpp +++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp @@ -38,6 +38,7 @@ QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent) m_roleNames.insert(Type, "type"); m_roleNames.insert(Status, "status"); m_roleNames.insert(Name, "name"); + m_roleNames.insert(Powered, "powered"); } QHash<int, QByteArray> QNetworkSettingsInterfaceModel::roleNames() const @@ -71,6 +72,9 @@ QVariant QNetworkSettingsInterfaceModel::data(const QModelIndex & index, int rol case Status: return item->state(); break; + case Powered: + return item->powered(); + break; default: return QStringLiteral(""); } diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 7e9b870..4ecebc7 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -55,7 +55,8 @@ public: enum Roles { Type = Qt::UserRole + 1, Status, - Name + Name, + Powered }; private: |