diff options
author | Bernd Weimer <bernd.weimer@qt.io> | 2022-08-08 08:22:54 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2022-08-08 09:28:21 +0000 |
commit | 7f3bda0bdc9c4c1c704fbcf8585e3470f9f9e9f5 (patch) | |
tree | 4b6bf03ecc16ccde72399d64769f8c047ce84b8a /sysui | |
parent | 4c845c092c550d118d7ca3a4ca863aa94ec78882 (diff) |
Remove QML import version numbers
Change-Id: I2810c412a595b2b5729fd57f8c4a3a1a2356c363
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'sysui')
69 files changed, 371 insertions, 371 deletions
diff --git a/sysui/about/About.qml b/sysui/about/About.qml index 1258e852..7b5f79ea 100644 --- a/sysui/about/About.qml +++ b/sysui/about/About.qml @@ -30,10 +30,10 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQml 2.14 +import QtQuick +import QtQml -import system.controls 1.0 +import system.controls /* A seamless wrapper for AboutPopup that loads it on demand diff --git a/sysui/about/AboutApps.qml b/sysui/about/AboutApps.qml index 56adfee5..6a436248 100644 --- a/sysui/about/AboutApps.qml +++ b/sysui/about/AboutApps.qml @@ -30,16 +30,16 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQml 2.14 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 -import QtApplicationManager.SystemUI 2.0 - -import shared.Style 1.0 -import shared.Sizes 1.0 -import shared.utils 1.0 -import shared.controls 1.0 +import QtQuick +import QtQml +import QtQuick.Controls +import QtQuick.Layouts +import QtApplicationManager.SystemUI + +import shared.Style +import shared.Sizes +import shared.utils +import shared.controls Item { id: root diff --git a/sysui/about/AboutDiagnostics.qml b/sysui/about/AboutDiagnostics.qml index 0fd0dc28..3635f90a 100644 --- a/sysui/about/AboutDiagnostics.qml +++ b/sysui/about/AboutDiagnostics.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes ColumnLayout { property var sysinfo diff --git a/sysui/about/AboutPerformance.qml b/sysui/about/AboutPerformance.qml index f3d8cfb6..20cc420d 100644 --- a/sysui/about/AboutPerformance.qml +++ b/sysui/about/AboutPerformance.qml @@ -30,10 +30,10 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick +import QtQuick.Controls -import shared.Sizes 1.0 +import shared.Sizes Flickable { id: root diff --git a/sysui/about/AboutPopup.qml b/sysui/about/AboutPopup.qml index b8b711d2..569e15f1 100644 --- a/sysui/about/AboutPopup.qml +++ b/sysui/about/AboutPopup.qml @@ -30,15 +30,15 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import shared.Style 1.0 -import shared.Sizes 1.0 -import shared.utils 1.0 -import shared.controls 1.0 -import system.controls 1.0 +import shared.Style +import shared.Sizes +import shared.utils +import shared.controls +import system.controls import "../procmon" diff --git a/sysui/centerconsole/+lucee/CenterConsole.qml b/sysui/centerconsole/+lucee/CenterConsole.qml index 3735cd99..3a61a437 100644 --- a/sysui/centerconsole/+lucee/CenterConsole.qml +++ b/sysui/centerconsole/+lucee/CenterConsole.qml @@ -30,20 +30,20 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import about 1.0 -import centerconsole 1.0 -import statusbar 1.0 -import stores 1.0 -import system.controls 1.0 +import shared.controls +import shared.utils +import shared.animations +import about +import centerconsole +import statusbar +import stores +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes AbstractCenterConsole { id: root diff --git a/sysui/centerconsole/AbstractCenterConsole.qml b/sysui/centerconsole/AbstractCenterConsole.qml index d4c6cb7a..57ed1f9d 100644 --- a/sysui/centerconsole/AbstractCenterConsole.qml +++ b/sysui/centerconsole/AbstractCenterConsole.qml @@ -30,21 +30,21 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQml 2.14 -import QtQuick.Controls 2.2 - -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import centerconsole 1.0 -import volume 1.0 -import statusbar 1.0 -import stores 1.0 -import system.controls 1.0 - -import shared.Style 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQml +import QtQuick.Controls + +import shared.controls +import shared.utils +import shared.animations +import centerconsole +import volume +import statusbar +import stores +import system.controls + +import shared.Style +import shared.Sizes Item { id: root diff --git a/sysui/centerconsole/ApplicationFrame.qml b/sysui/centerconsole/ApplicationFrame.qml index 48a25d90..d35d84d5 100644 --- a/sysui/centerconsole/ApplicationFrame.qml +++ b/sysui/centerconsole/ApplicationFrame.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick -import shared.animations 1.0 -import system.controls 1.0 -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.animations +import system.controls +import shared.Style +import shared.Sizes /* Displays the main window of a given application using in and out transition animations diff --git a/sysui/centerconsole/ApplicationPopup.qml b/sysui/centerconsole/ApplicationPopup.qml index 45c082f4..5d4d067a 100644 --- a/sysui/centerconsole/ApplicationPopup.qml +++ b/sysui/centerconsole/ApplicationPopup.qml @@ -37,10 +37,10 @@ \brief Displays the content of an application's PopupWindow inside a PopupItem in System-UI */ -import QtQuick 2.7 -import system.controls 1.0 +import QtQuick +import system.controls -import shared.Style 1.0 +import shared.Style PopupItem { id: root diff --git a/sysui/centerconsole/ApplicationPopups.qml b/sysui/centerconsole/ApplicationPopups.qml index 5df2a2d4..fa160de8 100644 --- a/sysui/centerconsole/ApplicationPopups.qml +++ b/sysui/centerconsole/ApplicationPopups.qml @@ -30,10 +30,10 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import stores 1.0 -import QtApplicationManager.SystemUI 2.0 -import shared.Style 1.0 +import QtQuick +import stores +import QtApplicationManager.SystemUI +import shared.Style /* Instantiates PopupItems for displaying PopupWindows created from the client side. diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml index 13c6c277..eacec20a 100644 --- a/sysui/centerconsole/CenterConsole.qml +++ b/sysui/centerconsole/CenterConsole.qml @@ -30,22 +30,22 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQml 2.14 -import QtQuick.Controls 2.2 +import QtQuick +import QtQml +import QtQuick.Controls -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import about 1.0 -import centerconsole 1.0 -import volume 1.0 -import statusbar 1.0 -import stores 1.0 -import system.controls 1.0 +import shared.controls +import shared.utils +import shared.animations +import about +import centerconsole +import volume +import statusbar +import stores +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes AbstractCenterConsole { id: root diff --git a/sysui/centerconsole/CenterConsoleMonitorOverlay.qml b/sysui/centerconsole/CenterConsoleMonitorOverlay.qml index 61f6d156..a3849db8 100644 --- a/sysui/centerconsole/CenterConsoleMonitorOverlay.qml +++ b/sysui/centerconsole/CenterConsoleMonitorOverlay.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.Sizes 1.0 -import shared.utils 1.0 +import shared.Sizes +import shared.utils MonitorOverlay { id: root diff --git a/sysui/centerconsole/CenterConsoleWindow.qml b/sysui/centerconsole/CenterConsoleWindow.qml index 15f76cd5..37c1ad93 100644 --- a/sysui/centerconsole/CenterConsoleWindow.qml +++ b/sysui/centerconsole/CenterConsoleWindow.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQml 2.14 -import shared.utils 1.0 -import stores 1.0 -import QtQuick.Window 2.3 +import QtQuick +import QtQml +import shared.utils +import stores +import QtQuick.Window -import shared.Sizes 1.0 +import shared.Sizes Window { id: root diff --git a/sysui/centerconsole/GamePadController.qml b/sysui/centerconsole/GamePadController.qml index 9be31f9c..4bb2d2bc 100644 --- a/sysui/centerconsole/GamePadController.qml +++ b/sysui/centerconsole/GamePadController.qml @@ -29,8 +29,8 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import QtGamepad 1.0 +import QtQuick +import QtGamepad Item { id: root diff --git a/sysui/centerconsole/MainContentArea.qml b/sysui/centerconsole/MainContentArea.qml index f4f152cc..342731a3 100644 --- a/sysui/centerconsole/MainContentArea.qml +++ b/sysui/centerconsole/MainContentArea.qml @@ -30,14 +30,14 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick import Qt5Compat.GraphicalEffects -import shared.animations 1.0 -import home 1.0 -import launcher 1.0 -import shared.utils 1.0 +import shared.animations +import home +import launcher +import shared.utils -import shared.Sizes 1.0 +import shared.Sizes Item { id: root diff --git a/sysui/centerconsole/ModalOverlay.qml b/sysui/centerconsole/ModalOverlay.qml index f0c04c02..9d5247c9 100644 --- a/sysui/centerconsole/ModalOverlay.qml +++ b/sysui/centerconsole/ModalOverlay.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick import Qt5Compat.GraphicalEffects -import shared.animations 1.0 -import shared.utils 1.0 -import shared.Sizes 1.0 +import shared.animations +import shared.utils +import shared.Sizes // We can't use Popup from QtQuick.Controls as it doesn't support a rotated scene, // hence the implementation of our own modal overlay scheme diff --git a/sysui/centerconsole/UIShortcuts.qml b/sysui/centerconsole/UIShortcuts.qml index d2d2eb9f..19b31ed1 100644 --- a/sysui/centerconsole/UIShortcuts.qml +++ b/sysui/centerconsole/UIShortcuts.qml @@ -30,7 +30,7 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick /* Keyboard shortcuts to simulate specific UI events when triggered. diff --git a/sysui/centerconsole/VirtualKeyboard.qml b/sysui/centerconsole/VirtualKeyboard.qml index a201317d..44bd0076 100644 --- a/sysui/centerconsole/VirtualKeyboard.qml +++ b/sysui/centerconsole/VirtualKeyboard.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.VirtualKeyboard 2.1 -import QtQuick.VirtualKeyboard.Settings 2.1 +import QtQuick +import QtQuick.VirtualKeyboard +import QtQuick.VirtualKeyboard.Settings -import shared.animations 1.0 +import shared.animations Item { id: root diff --git a/sysui/centerconsole/WidgetDrawer.qml b/sysui/centerconsole/WidgetDrawer.qml index 41b5f385..5b44c3cb 100644 --- a/sysui/centerconsole/WidgetDrawer.qml +++ b/sysui/centerconsole/WidgetDrawer.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import shared.utils 1.0 -import shared.Sizes 1.0 +import QtQuick +import shared.utils +import shared.Sizes /* Displays a child item on the screen which can be dismissed by swiping it to the right. diff --git a/sysui/home/+lucee/ApplicationWidget.qml b/sysui/home/+lucee/ApplicationWidget.qml index 49f1c6a0..da30cf5a 100644 --- a/sysui/home/+lucee/ApplicationWidget.qml +++ b/sysui/home/+lucee/ApplicationWidget.qml @@ -30,17 +30,17 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import shared.animations 1.0 -import shared.utils 1.0 -import shared.controls 1.0 -import system.controls 1.0 +import shared.animations +import shared.utils +import shared.controls +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 -import home 1.0 +import shared.Style +import shared.Sizes +import home AbstractApplicationWidget { id: root diff --git a/sysui/home/+lucee/HomePage.qml b/sysui/home/+lucee/HomePage.qml index c40b1ac6..889dd24b 100644 --- a/sysui/home/+lucee/HomePage.qml +++ b/sysui/home/+lucee/HomePage.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.Sizes 1.0 +import shared.Sizes -import home 1.0 +import home AbstractHomePage { id: root diff --git a/sysui/home/+lucee/ResizeHandle.qml b/sysui/home/+lucee/ResizeHandle.qml index 296d946a..de70dd0d 100644 --- a/sysui/home/+lucee/ResizeHandle.qml +++ b/sysui/home/+lucee/ResizeHandle.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import shared.Sizes 1.0 +import QtQuick +import shared.Sizes Item { id: root diff --git a/sysui/home/AbstractApplicationWidget.qml b/sysui/home/AbstractApplicationWidget.qml index b2341c58..df9ddf51 100644 --- a/sysui/home/AbstractApplicationWidget.qml +++ b/sysui/home/AbstractApplicationWidget.qml @@ -30,16 +30,16 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import shared.animations 1.0 -import shared.utils 1.0 -import shared.controls 1.0 -import system.controls 1.0 +import shared.animations +import shared.utils +import shared.controls +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Item { id: root diff --git a/sysui/home/AbstractHomePage.qml b/sysui/home/AbstractHomePage.qml index f422482b..f118dd6e 100644 --- a/sysui/home/AbstractHomePage.qml +++ b/sysui/home/AbstractHomePage.qml @@ -30,14 +30,14 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 +import shared.controls +import shared.utils +import shared.animations -import shared.Sizes 1.0 +import shared.Sizes Item { id: root diff --git a/sysui/home/AddWidgetPopup.qml b/sysui/home/AddWidgetPopup.qml index 203378af..2f01660a 100644 --- a/sysui/home/AddWidgetPopup.qml +++ b/sysui/home/AddWidgetPopup.qml @@ -30,15 +30,15 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQml.Models 2.2 +import QtQuick +import QtQuick.Controls +import QtQml.Models -import shared.controls 1.0 -import system.controls 1.0 +import shared.controls +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes PopupItem { id: root diff --git a/sysui/home/AddWidgetPopupLoader.qml b/sysui/home/AddWidgetPopupLoader.qml index 7aac2f23..80cf26be 100644 --- a/sysui/home/AddWidgetPopupLoader.qml +++ b/sysui/home/AddWidgetPopupLoader.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQml 2.14 +import QtQuick +import QtQml /* A seamless wrapper for AddWidgetPopup that loads it on demand diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml index b24bd7c4..8ac0c3c5 100644 --- a/sysui/home/ApplicationWidget.qml +++ b/sysui/home/ApplicationWidget.qml @@ -30,16 +30,16 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import shared.animations 1.0 -import shared.utils 1.0 -import shared.controls 1.0 -import system.controls 1.0 +import shared.animations +import shared.utils +import shared.controls +import system.controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes AbstractApplicationWidget { id: root diff --git a/sysui/home/HomePage.qml b/sysui/home/HomePage.qml index a023b286..0eefd491 100644 --- a/sysui/home/HomePage.qml +++ b/sysui/home/HomePage.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import shared.Sizes 1.0 +import QtQuick +import QtQuick.Controls +import shared.Sizes AbstractHomePage { id: root diff --git a/sysui/home/ResizeHandle.qml b/sysui/home/ResizeHandle.qml index 74bfc5e3..6b15cf24 100644 --- a/sysui/home/ResizeHandle.qml +++ b/sysui/home/ResizeHandle.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import shared.Sizes 1.0 +import QtQuick +import shared.Sizes Item { id: root diff --git a/sysui/home/WidgetGrid.qml b/sysui/home/WidgetGrid.qml index 123cd226..6e631599 100644 --- a/sysui/home/WidgetGrid.qml +++ b/sysui/home/WidgetGrid.qml @@ -30,16 +30,16 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick +import QtQuick.Controls -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 +import shared.controls +import shared.utils +import shared.animations -import shared.NeptuneWidgetGrid 1.0 +import shared.NeptuneWidgetGrid -import shared.Sizes 1.0 +import shared.Sizes Item { id: root diff --git a/sysui/hud/HUDWindow.qml b/sysui/hud/HUDWindow.qml index af290a8f..c74db078 100644 --- a/sysui/hud/HUDWindow.qml +++ b/sysui/hud/HUDWindow.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 -import shared.utils 1.0 -import system.controls 1.0 -import QtQuick.Window 2.3 -import shared.Sizes 1.0 -import shared.Style 1.0 +import QtQuick +import QtQuick.Controls +import shared.utils +import system.controls +import QtQuick.Window +import shared.Sizes +import shared.Style Window { id: root diff --git a/sysui/instrumentcluster/ApplicationICWindows.qml b/sysui/instrumentcluster/ApplicationICWindows.qml index ca1bcb47..60a4ce6a 100644 --- a/sysui/instrumentcluster/ApplicationICWindows.qml +++ b/sysui/instrumentcluster/ApplicationICWindows.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQml.Models 2.2 -import system.controls 1.0 -import shared.animations 1.0 -import shared.Style 1.0 -import shared.utils 1.0 +import QtQuick +import QtQml.Models +import system.controls +import shared.animations +import shared.Style +import shared.utils Item { id: root diff --git a/sysui/instrumentcluster/InstrumentClusterWindow.qml b/sysui/instrumentcluster/InstrumentClusterWindow.qml index 8a883117..6857654e 100644 --- a/sysui/instrumentcluster/InstrumentClusterWindow.qml +++ b/sysui/instrumentcluster/InstrumentClusterWindow.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQml 2.14 -import shared.utils 1.0 -import QtQuick.Window 2.3 -import system.controls 1.0 -import shared.Style 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQml +import shared.utils +import QtQuick.Window +import system.controls +import shared.Style +import shared.Sizes Window { id: root @@ -60,7 +60,7 @@ Window { function sendWindowStateToSafeUI() { if (root.clusterStore.runningOnDesktop) { var sendMessageObject = Qt.createQmlObject( - "import QtQuick 2.0; import Qt.SafeRenderer 1.1; + "import QtQuick 2.0; import Qt.SafeRenderer; QtObject { function sendClusterWindowState(x,y, dx, dy, width, height) { SafeMessage.moveItem(\"mainWindowPos\", Qt.point(x, y)) diff --git a/sysui/launcher/+lucee/AppButton.qml b/sysui/launcher/+lucee/AppButton.qml index a91094f0..4f885389 100644 --- a/sysui/launcher/+lucee/AppButton.qml +++ b/sysui/launcher/+lucee/AppButton.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import shared.Style 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQuick.Controls +import shared.controls +import shared.utils +import shared.animations +import shared.Style +import shared.Sizes ToolButton { id: root diff --git a/sysui/launcher/+lucee/AppIcon.qml b/sysui/launcher/+lucee/AppIcon.qml index c3225faf..95e6eae0 100644 --- a/sysui/launcher/+lucee/AppIcon.qml +++ b/sysui/launcher/+lucee/AppIcon.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import shared.controls 1.0 -import shared.Style 1.0 +import QtQuick +import shared.controls +import shared.Style NeptuneIconLabel { property bool checked: false diff --git a/sysui/launcher/AppButton.qml b/sysui/launcher/AppButton.qml index b7574b49..19fbe988 100644 --- a/sysui/launcher/AppButton.qml +++ b/sysui/launcher/AppButton.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import shared.Style 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQuick.Controls +import shared.controls +import shared.utils +import shared.animations +import shared.Style +import shared.Sizes ToolButton { id: root diff --git a/sysui/launcher/AppIcon.qml b/sysui/launcher/AppIcon.qml index 41521996..b81ac834 100644 --- a/sysui/launcher/AppIcon.qml +++ b/sysui/launcher/AppIcon.qml @@ -30,7 +30,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick Image { property bool checked: false diff --git a/sysui/launcher/EditableGridView.qml b/sysui/launcher/EditableGridView.qml index caa3e444..dfba58b0 100644 --- a/sysui/launcher/EditableGridView.qml +++ b/sysui/launcher/EditableGridView.qml @@ -30,14 +30,14 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.2 -import QtQml.Models 2.1 -import QtQuick.Layouts 1.0 -import shared.controls 1.0 -import shared.utils 1.0 -import shared.animations 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts +import shared.controls +import shared.utils +import shared.animations +import shared.Sizes Item { id: root diff --git a/sysui/launcher/Launcher.qml b/sysui/launcher/Launcher.qml index 8bddacce..a4801a2e 100644 --- a/sysui/launcher/Launcher.qml +++ b/sysui/launcher/Launcher.qml @@ -30,17 +30,17 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQml.Models 2.1 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls +import QtQml.Models +import QtQuick.Layouts -import shared.animations 1.0 -import shared.controls 1.0 -import shared.utils 1.0 +import shared.animations +import shared.controls +import shared.utils -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Item { id: root diff --git a/sysui/notification/NotificationCenter.qml b/sysui/notification/NotificationCenter.qml index a62c4151..d4d9b23d 100644 --- a/sysui/notification/NotificationCenter.qml +++ b/sysui/notification/NotificationCenter.qml @@ -30,14 +30,14 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.0 -import shared.Sizes 1.0 -import shared.utils 1.0 -import shared.controls 1.0 -import shared.animations 1.0 -import system.models.notification 1.0 -import shared.Style 1.0 +import QtQuick +import QtQuick.Controls +import shared.Sizes +import shared.utils +import shared.controls +import shared.animations +import system.models.notification +import shared.Style Item { id: root diff --git a/sysui/notification/NotificationContent.qml b/sysui/notification/NotificationContent.qml index 62100f68..ec02c8ea 100644 --- a/sysui/notification/NotificationContent.qml +++ b/sysui/notification/NotificationContent.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import centerconsole 1.0 -import shared.animations 1.0 -import system.models.notification 1.0 -import shared.Sizes 1.0 +import QtQuick +import centerconsole +import shared.animations +import system.models.notification +import shared.Sizes ModalOverlay { id: root diff --git a/sysui/notification/NotificationHandle.qml b/sysui/notification/NotificationHandle.qml index 25fcb875..978a5dec 100644 --- a/sysui/notification/NotificationHandle.qml +++ b/sysui/notification/NotificationHandle.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.Sizes 1.0 -import shared.utils 1.0 -import shared.Style 1.0 +import shared.Sizes +import shared.utils +import shared.Style ToolButton { id: root diff --git a/sysui/notification/NotificationItem.qml b/sysui/notification/NotificationItem.qml index ef71e5c6..2e8f77f8 100644 --- a/sysui/notification/NotificationItem.qml +++ b/sysui/notification/NotificationItem.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.0 -import shared.controls 1.0 -import shared.Style 1.0 -import shared.Sizes 1.0 +import QtQuick +import QtQuick.Controls +import shared.controls +import shared.Style +import shared.Sizes Control { id: root diff --git a/sysui/notification/NotificationToast.qml b/sysui/notification/NotificationToast.qml index 142a352c..88eba106 100644 --- a/sysui/notification/NotificationToast.qml +++ b/sysui/notification/NotificationToast.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.0 -import shared.controls 1.0 -import shared.animations 1.0 -import system.models.notification 1.0 -import shared.Style 1.0 +import QtQuick +import QtQuick.Controls +import shared.controls +import shared.animations +import system.models.notification +import shared.Style NotificationItem { id: root diff --git a/sysui/procmon/CpuMonitor.qml b/sysui/procmon/CpuMonitor.qml index 37f6a0d6..5dd77e2d 100644 --- a/sysui/procmon/CpuMonitor.qml +++ b/sysui/procmon/CpuMonitor.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import shared.utils 1.0 -import shared.Sizes 1.0 +import QtQuick +import shared.utils +import shared.Sizes MonitorPanel { id: root diff --git a/sysui/procmon/MonitorListItem.qml b/sysui/procmon/MonitorListItem.qml index ccb09eb9..db78559c 100644 --- a/sysui/procmon/MonitorListItem.qml +++ b/sysui/procmon/MonitorListItem.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick +import QtQuick.Controls -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Item { id: root diff --git a/sysui/procmon/MonitorPanel.qml b/sysui/procmon/MonitorPanel.qml index addf0f7c..bb1de940 100644 --- a/sysui/procmon/MonitorPanel.qml +++ b/sysui/procmon/MonitorPanel.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import shared.Style 1.0 -import shared.Sizes 1.0 -import shared.utils 1.0 +import shared.Style +import shared.Sizes +import shared.utils Item { id: root diff --git a/sysui/procmon/MonitorView.qml b/sysui/procmon/MonitorView.qml index fd2f1839..83bd9eb8 100644 --- a/sysui/procmon/MonitorView.qml +++ b/sysui/procmon/MonitorView.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts -import shared.Sizes 1.0 -import shared.utils 1.0 +import shared.Sizes +import shared.utils ColumnLayout { id: root diff --git a/sysui/procmon/RamMonitor.qml b/sysui/procmon/RamMonitor.qml index e79149a8..71dc87bc 100644 --- a/sysui/procmon/RamMonitor.qml +++ b/sysui/procmon/RamMonitor.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import shared.Sizes 1.0 -import shared.utils 1.0 +import QtQuick +import shared.Sizes +import shared.utils MonitorPanel { id: root diff --git a/sysui/statusbar/+lucee/DateAndTime.qml b/sysui/statusbar/+lucee/DateAndTime.qml index 9238c028..31f25bc8 100644 --- a/sysui/statusbar/+lucee/DateAndTime.qml +++ b/sysui/statusbar/+lucee/DateAndTime.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import shared.utils 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import shared.utils -import shared.Sizes 1.0 +import shared.Sizes Label { id: root diff --git a/sysui/statusbar/+lucee/IndicatorTray.qml b/sysui/statusbar/+lucee/IndicatorTray.qml index ce4e7bc7..c3a43b18 100644 --- a/sysui/statusbar/+lucee/IndicatorTray.qml +++ b/sysui/statusbar/+lucee/IndicatorTray.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import shared.utils 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import shared.utils -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Control { id: root diff --git a/sysui/statusbar/+lucee/StatusBar.qml b/sysui/statusbar/+lucee/StatusBar.qml index bab1efbf..368a19cd 100644 --- a/sysui/statusbar/+lucee/StatusBar.qml +++ b/sysui/statusbar/+lucee/StatusBar.qml @@ -30,17 +30,17 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQml 2.14 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQml +import QtQuick.Controls +import QtQuick.Layouts -import shared.utils 1.0 -import shared.controls 1.0 -import volume 1.0 +import shared.utils +import shared.controls +import volume -import shared.Sizes 1.0 -import system.controls 1.0 +import shared.Sizes +import system.controls Item { id: root diff --git a/sysui/statusbar/CellularReception.qml b/sysui/statusbar/CellularReception.qml index a799171d..520d0b71 100644 --- a/sysui/statusbar/CellularReception.qml +++ b/sysui/statusbar/CellularReception.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import shared.utils 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import shared.utils -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Item { id: root diff --git a/sysui/statusbar/DateAndTime.qml b/sysui/statusbar/DateAndTime.qml index ce8071ec..5b47e0be 100644 --- a/sysui/statusbar/DateAndTime.qml +++ b/sysui/statusbar/DateAndTime.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import shared.utils 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import shared.utils -import shared.Sizes 1.0 +import shared.Sizes Label { id: root diff --git a/sysui/statusbar/IndicatorTray.qml b/sysui/statusbar/IndicatorTray.qml index 078e28ec..165c6992 100644 --- a/sysui/statusbar/IndicatorTray.qml +++ b/sysui/statusbar/IndicatorTray.qml @@ -30,13 +30,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 -import shared.utils 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import shared.utils -import shared.Style 1.0 -import shared.Sizes 1.0 +import shared.Style +import shared.Sizes Control { id: root diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml index 74c78d85..2c3fd544 100644 --- a/sysui/statusbar/StatusBar.qml +++ b/sysui/statusbar/StatusBar.qml @@ -30,15 +30,15 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import shared.utils 1.0 -import shared.controls 1.0 +import shared.utils +import shared.controls -import shared.Sizes 1.0 -import system.controls 1.0 +import shared.Sizes +import system.controls Item { id: root diff --git a/sysui/stores/ApplicationPopupsStore.qml b/sysui/stores/ApplicationPopupsStore.qml index def83379..5d678001 100644 --- a/sysui/stores/ApplicationPopupsStore.qml +++ b/sysui/stores/ApplicationPopupsStore.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import shared.utils 1.0 +import QtQuick +import shared.utils Store { id: root diff --git a/sysui/stores/CenterConsoleStore.qml b/sysui/stores/CenterConsoleStore.qml index 8e741200..8599eefb 100644 --- a/sysui/stores/CenterConsoleStore.qml +++ b/sysui/stores/CenterConsoleStore.qml @@ -31,8 +31,8 @@ ****************************************************************************/ import QtQuick -import QtApplicationManager.SystemUI 2.0 -import shared.utils 1.0 +import QtApplicationManager.SystemUI +import shared.utils import "../helper/utils.js" as Utils diff --git a/sysui/stores/ClusterStore.qml b/sysui/stores/ClusterStore.qml index c5266cf3..7d939407 100644 --- a/sysui/stores/ClusterStore.qml +++ b/sysui/stores/ClusterStore.qml @@ -30,12 +30,12 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQml 2.14 -import QtApplicationManager.SystemUI 2.0 -import shared.com.pelagicore.remotesettings 1.0 -import shared.com.pelagicore.drivedata 1.0 -import shared.utils 1.0 +import QtQuick +import QtQml +import QtApplicationManager.SystemUI +import shared.com.pelagicore.remotesettings +import shared.com.pelagicore.drivedata +import shared.utils QtObject { id: root diff --git a/sysui/stores/HUDStore.qml b/sysui/stores/HUDStore.qml index 8663c23a..b6a86de1 100644 --- a/sysui/stores/HUDStore.qml +++ b/sysui/stores/HUDStore.qml @@ -30,9 +30,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtApplicationManager.SystemUI 2.0 -import shared.com.pelagicore.drivedata 1.0 +import QtQuick +import QtApplicationManager.SystemUI +import shared.com.pelagicore.drivedata QtObject { id: root diff --git a/sysui/stores/MusicAppRequestsIPCStore.qml b/sysui/stores/MusicAppRequestsIPCStore.qml index 4e54d234..c32c8c64 100644 --- a/sysui/stores/MusicAppRequestsIPCStore.qml +++ b/sysui/stores/MusicAppRequestsIPCStore.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtApplicationManager.SystemUI 2.0 +import QtQuick +import QtApplicationManager.SystemUI /*! \qmltype MusicAppRequestsIPCStore diff --git a/sysui/stores/MusicStore.qml b/sysui/stores/MusicStore.qml index 204f4f09..6bbca3ab 100644 --- a/sysui/stores/MusicStore.qml +++ b/sysui/stores/MusicStore.qml @@ -29,8 +29,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtApplicationManager 2.0 +import QtQuick +import QtApplicationManager QtObject { id: root diff --git a/sysui/stores/RootStore.qml b/sysui/stores/RootStore.qml index a3ca2965..694da9f4 100644 --- a/sysui/stores/RootStore.qml +++ b/sysui/stores/RootStore.qml @@ -30,18 +30,18 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import Qt.labs.platform 1.0 -import QtApplicationManager 2.0 -import QtApplicationManager.Application 2.0 -import QtApplicationManager.SystemUI 2.0 -import shared.utils 1.0 -import shared.Style 1.0 +import QtQuick +import Qt.labs.platform +import QtApplicationManager +import QtApplicationManager.Application +import QtApplicationManager.SystemUI +import shared.utils +import shared.Style -import system.models.application 1.0 +import system.models.application -import shared.com.pelagicore.remotesettings 1.0 -import shared.com.pelagicore.systeminfo 1.0 +import shared.com.pelagicore.remotesettings +import shared.com.pelagicore.systeminfo Store { id: root @@ -84,7 +84,7 @@ Store { settingsStore.setValue("widgetStates", applicationModel.serializeWidgetStates()); if (clusterStore.qsrEnabled) { //not to have direct dependency on QtSafeRenderer - var sendMessageObject = Qt.createQmlObject("import QtQuick 2.0; import Qt.SafeRenderer 1.1; + var sendMessageObject = Qt.createQmlObject("import QtQuick; import Qt.SafeRenderer; QtObject { function sendShuttingDown() { SafeMessage.sendHeartBeat(1) //sends one message with 1 ms expire timeout diff --git a/sysui/stores/SettingsStore.qml b/sysui/stores/SettingsStore.qml index dc51d29d..69e686fb 100644 --- a/sysui/stores/SettingsStore.qml +++ b/sysui/stores/SettingsStore.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import Qt.labs.settings 1.0 +import QtQuick +import Qt.labs.settings Settings { id: root diff --git a/sysui/stores/StatusBarStore.qml b/sysui/stores/StatusBarStore.qml index b046ef42..5ee76aa8 100644 --- a/sysui/stores/StatusBarStore.qml +++ b/sysui/stores/StatusBarStore.qml @@ -30,7 +30,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick QtObject { id: root diff --git a/sysui/stores/SystemStore.qml b/sysui/stores/SystemStore.qml index 67cf05f6..3a1e4adc 100644 --- a/sysui/stores/SystemStore.qml +++ b/sysui/stores/SystemStore.qml @@ -30,10 +30,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtApplicationManager 2.0 -import QtApplicationManager.SystemUI 2.0 -import shared.utils 1.0 +import QtQuick +import QtApplicationManager +import QtApplicationManager.SystemUI +import shared.utils Store { id: root diff --git a/sysui/stores/VolumeStore.qml b/sysui/stores/VolumeStore.qml index 4f2dea80..64e06487 100644 --- a/sysui/stores/VolumeStore.qml +++ b/sysui/stores/VolumeStore.qml @@ -30,8 +30,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtInterfaceFramework.Media 1.0 +import QtQuick +import QtInterfaceFramework.Media QtObject { id: root diff --git a/sysui/volume/VolumePopup.qml b/sysui/volume/VolumePopup.qml index 126ef8d9..92b3bc78 100644 --- a/sysui/volume/VolumePopup.qml +++ b/sysui/volume/VolumePopup.qml @@ -30,16 +30,16 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import shared.utils 1.0 -import shared.animations 1.0 -import shared.Style 1.0 -import shared.controls 1.0 -import shared.Sizes 1.0 -import system.controls 1.0 +import shared.utils +import shared.animations +import shared.Style +import shared.controls +import shared.Sizes +import system.controls PopupItem { id: root diff --git a/sysui/volume/VolumeSlider.qml b/sysui/volume/VolumeSlider.qml index 11b598c2..9b1edcf5 100644 --- a/sysui/volume/VolumeSlider.qml +++ b/sysui/volume/VolumeSlider.qml @@ -30,11 +30,11 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick +import QtQuick.Controls -import shared.Sizes 1.0 -import shared.utils 1.0 +import shared.Sizes +import shared.utils Slider { id: root |