summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-03 03:00:03 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-03 03:00:03 +0200
commitca09bb69645cafe38e16c368c49b2864e75892ed (patch)
tree20bf42ab2e0948122a8d4584748a2e78ba05bf10
parent321353b82fef7c675a5d62bb38c913fdc41e4f27 (diff)
parent51cd8493b5d3d7d4e74d3733df6d8ad12f1866fe (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
-rw-r--r--src/networksettings/qnetworksettingsservicemodel.cpp11
-rw-r--r--src/settingsui/network/WiredSettings.qml5
2 files changed, 7 insertions, 9 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index a62d415..115fe35 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -380,13 +380,10 @@ bool QNetworkSettingsServiceFilter::filterAcceptsRow( int source_row, const QMod
QModelIndex index = this->sourceModel()->index( source_row, 0, source_parent );
if (index.isValid())
{
- if (index.isValid())
- {
- QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole));
- QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj);
- if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown)
- return true;
- }
+ QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole));
+ QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj);
+ if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown)
+ return true;
}
}
return false;
diff --git a/src/settingsui/network/WiredSettings.qml b/src/settingsui/network/WiredSettings.qml
index 3bf211e..11c6c24 100644
--- a/src/settingsui/network/WiredSettings.qml
+++ b/src/settingsui/network/WiredSettings.qml
@@ -45,8 +45,9 @@ Item {
}
onServiceChanged: {
- if (!service) {
- service = NetworkSettingsManager.services.itemFromRow(0);
+ NetworkSettingsManager.services.type = NetworkSettingsType.Wired;
+ if (!root.service) {
+ root.service = NetworkSettingsManager.services.itemFromRow(0);
}
}