summaryrefslogtreecommitdiffstats
path: root/src/settingsui/settingsuiplugin/plugin.cpp
diff options
context:
space:
mode:
authorLassi Lehikoinen <lassi.lehikoinen@qt.io>2020-12-16 15:21:23 +0200
committerLassi Lehikoinen <lassi.lehikoinen@qt.io>2020-12-21 10:33:50 +0200
commita1df8e45166f15ed77e2ef8b3ad6757299662dc7 (patch)
tree96d355ea2e3cd6cdac0ada865e85130c0adeae6d /src/settingsui/settingsuiplugin/plugin.cpp
parentaa9223a4d7d410aa8a12495fef5c3f36a2c79ffe (diff)
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>
Diffstat (limited to 'src/settingsui/settingsuiplugin/plugin.cpp')
-rw-r--r--src/settingsui/settingsuiplugin/plugin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settingsui/settingsuiplugin/plugin.cpp b/src/settingsui/settingsuiplugin/plugin.cpp
index 3e9a274..3ea37ad 100644
--- a/src/settingsui/settingsuiplugin/plugin.cpp
+++ b/src/settingsui/settingsuiplugin/plugin.cpp
@@ -38,7 +38,7 @@ static void initResources()
}
/*!
- \qmlmodule QtDeviceUtilities.SettingsUI 1.0
+ \qmlmodule QtDeviceUtilities.SettingsUI
\title Qt Device Utilities: Settings UI
\ingroup qtdevice-utilities-qml-modules
\ingroup qmlmodules
@@ -51,7 +51,7 @@ static void initResources()
To import and use the module's QML types, use the following statement:
\badcode
- import QtDeviceUtilities.SettingsUI 1.0
+ import QtDeviceUtilities.SettingsUI
\endcode
\section1 QML Types
@@ -68,8 +68,8 @@ static void initResources()
For example:
\qml
- import QtQuick 2.6
- import QtDeviceUtilities.SettingsUI 1.0
+ import QtQuick
+ import QtDeviceUtilities.SettingsUI
SettingsUI {
id: settingsUI
@@ -94,7 +94,7 @@ public:
{
// @uri QtDeviceUtilities.SettingsUI
Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI"));
- qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
+ qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 2, 0, "SettingsUI");
}
};