From 3895b8504f65346a1de19aa1ceb9570175337283 Mon Sep 17 00:00:00 2001
From: Juho Annunen <juho.annunen@qt.io>
Date: Wed, 11 Oct 2017 13:30:52 +0300
Subject: 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>
---
 src/networksettings/qnetworksettingsservicemodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/networksettings')

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;
            }
        }
-- 
cgit v1.2.3