Modify settingsui to work against Qt 6

Following modules are removed in Qt 6
- XmlListModel
- QtGraphicalEffects

Adapt settingsui to work without them.
Also remove needless resources and make miscallaneous improvements.

Task-number: QTBUG-89065
Change-Id: Ie66d73e4d8f9c1dd4cbec2fe5f9f71f32f7d1bdf
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/imports/networksettings/CMakeLists.txt b/src/imports/networksettings/CMakeLists.txt
index 0c43a30..b2b07b8 100644
--- a/src/imports/networksettings/CMakeLists.txt
+++ b/src/imports/networksettings/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_add_qml_module(networksettingsplugin
         Qt::Gui
         Qt::Qml
         Qt::Quick
-        networksettings
+        Qt::NetworkSettings
 )
 
 #### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>:
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 56bece7..e4d6cee 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -40,7 +40,7 @@
 #include <QQmlContext>
 
 /*!
-    \qmlmodule QtDeviceUtilities.NetworkSettings 1.0
+    \qmlmodule QtDeviceUtilities.NetworkSettings
     \ingroup qtdevice-utilities-qml-modules
     \ingroup qmlmodules
     \title Qt Network Settings QML Types
@@ -53,7 +53,7 @@
     To import and use the module's QML types, use the following statement:
 
     \badcode
-    import QtDeviceUtilities.NetworkSettings 1.0
+    import QtDeviceUtilities.NetworkSettings
     \endcode
 
     \l{Qt Device Utilities WiFi Tutorial} demonstrates how you can use
@@ -185,7 +185,7 @@ void NetworkSettingsQmlPlugin::registerTypes(const char *uri)
     qRegisterMetaType<QNetworkSettingsServiceFilter*>("QNetworkSettingsServiceFilter*");
     qRegisterMetaType<QNetworkSettingsInterfaceModel*>("QNetworkSettingsInterfaceModel*");
 
-    qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
+    qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 2, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
 }
 
 QT_END_NAMESPACE