summaryrefslogtreecommitdiffstats
path: root/src/networksettings/qnetworksettingsservicemodel.cpp
diff options
context:
space:
mode:
authorJuho Annunen <juho.annunen@qt.io>2017-10-11 13:30:52 +0300
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 10:40:45 +0000
commit3895b8504f65346a1de19aa1ceb9570175337283 (patch)
tree3c97b2b57874bc1d3932350b4db7a779ddd80840 /src/networksettings/qnetworksettingsservicemodel.cpp
parent61e9e8c83e817b3692beae03bd8e683d247207b0 (diff)
Update API and settings UI
Implemented new UI design for Settings and minor changes to API Task-number: QTBUG-63091 Change-Id: Id72e20b53bc33ca0a3068d1e9b664fc5836a1cda Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/qnetworksettingsservicemodel.cpp')
-rw-r--r--src/networksettings/qnetworksettingsservicemodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index f7a8a26..a85883e 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -202,7 +202,7 @@ void QNetworkSettingsServiceModel::signalStrengthChanged()
*/
QNetworkSettingsServiceFilter::QNetworkSettingsServiceFilter(QObject* parent)
- :QSortFilterProxyModel(parent)
+ :QSortFilterProxyModel(parent), m_type(QNetworkSettingsType::Unknown)
{
connect(this, &QNetworkSettingsServiceFilter::typeChanged, this, &QNetworkSettingsServiceFilter::invalidate);
}
@@ -242,7 +242,7 @@ bool QNetworkSettingsServiceFilter::filterAcceptsRow( int source_row, const QMod
{
QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole));
QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj);
- if (service->type() == m_type)
+ if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown)
return true;
}
}