diff --git a/NERODevelopment/content/App.qml b/NERODevelopment/content/App.qml index 36d427b..1a5e0e3 100644 --- a/NERODevelopment/content/App.qml +++ b/NERODevelopment/content/App.qml @@ -1,6 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -import QtQuick 6.2 +import QtQuick import NERO Window { diff --git a/NERODevelopment/content/Arrow.qml b/NERODevelopment/content/Arrow.qml index 2a3acf7..ecaa524 100644 --- a/NERODevelopment/content/Arrow.qml +++ b/NERODevelopment/content/Arrow.qml @@ -1,6 +1,5 @@ -import QtQuick 2.0 -import QtQuick.Shapes import QtQuick +import QtQuick.Shapes import NERO Item { diff --git a/NERODevelopment/content/Battery.qml b/NERODevelopment/content/Battery.qml index bbf8dc7..fcb799c 100644 --- a/NERODevelopment/content/Battery.qml +++ b/NERODevelopment/content/Battery.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Rectangle { diff --git a/NERODevelopment/content/BatteryValueComponent.qml b/NERODevelopment/content/BatteryValueComponent.qml index 5de20f8..8b244db 100644 --- a/NERODevelopment/content/BatteryValueComponent.qml +++ b/NERODevelopment/content/BatteryValueComponent.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/CriticalFaultIcon.qml b/NERODevelopment/content/CriticalFaultIcon.qml index d44c2a4..29c01ab 100644 --- a/NERODevelopment/content/CriticalFaultIcon.qml +++ b/NERODevelopment/content/CriticalFaultIcon.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Shapes import NERO diff --git a/NERODevelopment/content/DescriptionModal.qml b/NERODevelopment/content/DescriptionModal.qml index 652523a..93bef7c 100644 --- a/NERODevelopment/content/DescriptionModal.qml +++ b/NERODevelopment/content/DescriptionModal.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects import NERO diff --git a/NERODevelopment/content/DetailDisplay.qml b/NERODevelopment/content/DetailDisplay.qml index a0d172f..0b2b519 100644 --- a/NERODevelopment/content/DetailDisplay.qml +++ b/NERODevelopment/content/DetailDisplay.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Particles import NERO diff --git a/NERODevelopment/content/DirectionView.qml b/NERODevelopment/content/DirectionView.qml index f216b8b..c26d0e0 100644 --- a/NERODevelopment/content/DirectionView.qml +++ b/NERODevelopment/content/DirectionView.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import NERO Item { diff --git a/NERODevelopment/content/EfficiencyScreen.qml b/NERODevelopment/content/EfficiencyScreen.qml index c32d1f6..348383b 100644 --- a/NERODevelopment/content/EfficiencyScreen.qml +++ b/NERODevelopment/content/EfficiencyScreen.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Particles import QtQuick.Layouts diff --git a/NERODevelopment/content/FaultDialog.qml b/NERODevelopment/content/FaultDialog.qml index c60f40a..0ac7546 100644 --- a/NERODevelopment/content/FaultDialog.qml +++ b/NERODevelopment/content/FaultDialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects import NERO diff --git a/NERODevelopment/content/FlappyBird.qml b/NERODevelopment/content/FlappyBird.qml index 786bf5a..37ded8f 100644 --- a/NERODevelopment/content/FlappyBird.qml +++ b/NERODevelopment/content/FlappyBird.qml @@ -1,7 +1,5 @@ -import QtQuick 2.15 - -import QtQuick 2.9 -import QtQuick.Window 2.2 +import QtQuick +import QtQuick.Window import NERO Item { diff --git a/NERODevelopment/content/HeaderView.qml b/NERODevelopment/content/HeaderView.qml index 5d0faa3..81d3059 100644 --- a/NERODevelopment/content/HeaderView.qml +++ b/NERODevelopment/content/HeaderView.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Item { diff --git a/NERODevelopment/content/HomeIcon.qml b/NERODevelopment/content/HomeIcon.qml index 89f9c87..6ce5b56 100644 --- a/NERODevelopment/content/HomeIcon.qml +++ b/NERODevelopment/content/HomeIcon.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/HomeMenuItem.qml b/NERODevelopment/content/HomeMenuItem.qml index d82aee6..c1bead6 100644 --- a/NERODevelopment/content/HomeMenuItem.qml +++ b/NERODevelopment/content/HomeMenuItem.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import NERO Rectangle { diff --git a/NERODevelopment/content/LabelText.qml b/NERODevelopment/content/LabelText.qml index 4a01d31..b825ea6 100644 --- a/NERODevelopment/content/LabelText.qml +++ b/NERODevelopment/content/LabelText.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Text { diff --git a/NERODevelopment/content/LabeledComponent.qml b/NERODevelopment/content/LabeledComponent.qml index 36b4300..67c5eef 100644 --- a/NERODevelopment/content/LabeledComponent.qml +++ b/NERODevelopment/content/LabeledComponent.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/Lightning.qml b/NERODevelopment/content/Lightning.qml index ec28fbb..e07bdb1 100644 --- a/NERODevelopment/content/Lightning.qml +++ b/NERODevelopment/content/Lightning.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Shapes import NERO diff --git a/NERODevelopment/content/MaxDrawGraph.qml b/NERODevelopment/content/MaxDrawGraph.qml index dfbee93..0196f3d 100644 --- a/NERODevelopment/content/MaxDrawGraph.qml +++ b/NERODevelopment/content/MaxDrawGraph.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import NERO Rectangle { diff --git a/NERODevelopment/content/MaxSpeedComparator.qml b/NERODevelopment/content/MaxSpeedComparator.qml index 0314428..d9caf4f 100644 --- a/NERODevelopment/content/MaxSpeedComparator.qml +++ b/NERODevelopment/content/MaxSpeedComparator.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Rectangle { diff --git a/NERODevelopment/content/MicrophoneComponent.qml b/NERODevelopment/content/MicrophoneComponent.qml index cf0b9f3..6e7c313 100644 --- a/NERODevelopment/content/MicrophoneComponent.qml +++ b/NERODevelopment/content/MicrophoneComponent.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects import NERO diff --git a/NERODevelopment/content/NavigationController.qml b/NERODevelopment/content/NavigationController.qml index cec44c0..82f39ad 100644 --- a/NERODevelopment/content/NavigationController.qml +++ b/NERODevelopment/content/NavigationController.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/NonCriticalWarning.qml b/NERODevelopment/content/NonCriticalWarning.qml index e393a7a..67c78cf 100644 --- a/NERODevelopment/content/NonCriticalWarning.qml +++ b/NERODevelopment/content/NonCriticalWarning.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Item { diff --git a/NERODevelopment/content/OffScreen.qml b/NERODevelopment/content/OffScreen.qml index 572a20f..7a3ea9a 100644 --- a/NERODevelopment/content/OffScreen.qml +++ b/NERODevelopment/content/OffScreen.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/OffScreen2.qml b/NERODevelopment/content/OffScreen2.qml index 801591f..0fd8bbf 100644 --- a/NERODevelopment/content/OffScreen2.qml +++ b/NERODevelopment/content/OffScreen2.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/Pit.qml b/NERODevelopment/content/Pit.qml index 3aa123f..2d3c74c 100644 --- a/NERODevelopment/content/Pit.qml +++ b/NERODevelopment/content/Pit.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/Radial.qml b/NERODevelopment/content/Radial.qml index 097f16a..210fbb0 100644 --- a/NERODevelopment/content/Radial.qml +++ b/NERODevelopment/content/Radial.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtQuick.Shapes 1.15 +import QtQuick +import QtQuick.Shapes import NERO Item { diff --git a/NERODevelopment/content/RunInfo.qml b/NERODevelopment/content/RunInfo.qml index 7612eaa..0d3a09f 100644 --- a/NERODevelopment/content/RunInfo.qml +++ b/NERODevelopment/content/RunInfo.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Item { diff --git a/NERODevelopment/content/Snake.qml b/NERODevelopment/content/Snake.qml index 942fad8..cfb5f2a 100644 --- a/NERODevelopment/content/Snake.qml +++ b/NERODevelopment/content/Snake.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls Rectangle { id: snakeGame diff --git a/NERODevelopment/content/SnakeBody.qml b/NERODevelopment/content/SnakeBody.qml index 6283614..376b20b 100644 --- a/NERODevelopment/content/SnakeBody.qml +++ b/NERODevelopment/content/SnakeBody.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls Item { id: food diff --git a/NERODevelopment/content/SnakeFood.qml b/NERODevelopment/content/SnakeFood.qml index 43852a6..54a1e10 100644 --- a/NERODevelopment/content/SnakeFood.qml +++ b/NERODevelopment/content/SnakeFood.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls Item { id: food diff --git a/NERODevelopment/content/Spacer.qml b/NERODevelopment/content/Spacer.qml index d63e5d2..bee1247 100644 --- a/NERODevelopment/content/Spacer.qml +++ b/NERODevelopment/content/Spacer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts Item { diff --git a/NERODevelopment/content/SpeedMode.qml b/NERODevelopment/content/SpeedMode.qml index 20ddc53..dcdc873 100644 --- a/NERODevelopment/content/SpeedMode.qml +++ b/NERODevelopment/content/SpeedMode.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/StatusDisplay.qml b/NERODevelopment/content/StatusDisplay.qml index 622c44d..155dac7 100644 --- a/NERODevelopment/content/StatusDisplay.qml +++ b/NERODevelopment/content/StatusDisplay.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import QtQuick.Particles import NERO diff --git a/NERODevelopment/content/SubMenuIcon.qml b/NERODevelopment/content/SubMenuIcon.qml index e7d9e42..da62156 100644 --- a/NERODevelopment/content/SubMenuIcon.qml +++ b/NERODevelopment/content/SubMenuIcon.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Rectangle { diff --git a/NERODevelopment/content/Tank.qml b/NERODevelopment/content/Tank.qml index 3d4469e..bd9dc6c 100644 --- a/NERODevelopment/content/Tank.qml +++ b/NERODevelopment/content/Tank.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Studio.DesignEffects Rectangle { diff --git a/NERODevelopment/content/TankIcon.qml b/NERODevelopment/content/TankIcon.qml index 9b29d6b..750fc7e 100644 --- a/NERODevelopment/content/TankIcon.qml +++ b/NERODevelopment/content/TankIcon.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick Item { id: tankIcon diff --git a/NERODevelopment/content/Thermometer.qml b/NERODevelopment/content/Thermometer.qml index 07af6ec..71846b4 100644 --- a/NERODevelopment/content/Thermometer.qml +++ b/NERODevelopment/content/Thermometer.qml @@ -1,5 +1,5 @@ -import QtQuick 6.5 -import QtQuick.Controls 6.5 +import QtQuick +import QtQuick.Controls import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/ThermometerValueComponent.qml b/NERODevelopment/content/ThermometerValueComponent.qml index 12f7f98..506a6e8 100644 --- a/NERODevelopment/content/ThermometerValueComponent.qml +++ b/NERODevelopment/content/ThermometerValueComponent.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/TimerDisplay.qml b/NERODevelopment/content/TimerDisplay.qml index 0648a09..1bab8c0 100644 --- a/NERODevelopment/content/TimerDisplay.qml +++ b/NERODevelopment/content/TimerDisplay.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import NERO Item { diff --git a/NERODevelopment/content/TorqueAdj.qml b/NERODevelopment/content/TorqueAdj.qml index 617ea2f..8c6ae51 100644 --- a/NERODevelopment/content/TorqueAdj.qml +++ b/NERODevelopment/content/TorqueAdj.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Rectangle { diff --git a/NERODevelopment/content/TorqueValueComponent.qml b/NERODevelopment/content/TorqueValueComponent.qml index eda2dfd..cab9d6d 100644 --- a/NERODevelopment/content/TorqueValueComponent.qml +++ b/NERODevelopment/content/TorqueValueComponent.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts import NERO diff --git a/NERODevelopment/content/ValueDisplay.qml b/NERODevelopment/content/ValueDisplay.qml index 2d7e7a0..4ba6b9d 100644 --- a/NERODevelopment/content/ValueDisplay.qml +++ b/NERODevelopment/content/ValueDisplay.qml @@ -1,4 +1,4 @@ -import QtQuick 2.15 +import QtQuick import QtQuick.Layouts Item { diff --git a/NERODevelopment/content/ValueText.qml b/NERODevelopment/content/ValueText.qml index 9ced9b3..8563bfd 100644 --- a/NERODevelopment/content/ValueText.qml +++ b/NERODevelopment/content/ValueText.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import NERO Text { diff --git a/NERODevelopment/imports/NERO/Constants.qml b/NERODevelopment/imports/NERO/Constants.qml index c81d605..b818d0f 100644 --- a/NERODevelopment/imports/NERO/Constants.qml +++ b/NERODevelopment/imports/NERO/Constants.qml @@ -1,5 +1,5 @@ pragma Singleton -import QtQuick 6.2 +import QtQuick import QtQuick.Studio.Application QtObject { diff --git a/NERODevelopment/imports/NERO/DirectoryFontLoader.qml b/NERODevelopment/imports/NERO/DirectoryFontLoader.qml index aa22eac..2441c9c 100644 --- a/NERODevelopment/imports/NERO/DirectoryFontLoader.qml +++ b/NERODevelopment/imports/NERO/DirectoryFontLoader.qml @@ -1,8 +1,8 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -import QtQuick 6.2 -import Qt.labs.folderlistmodel 6.2 +import QtQuick +import Qt.labs.folderlistmodel QtObject { id: loader @@ -11,7 +11,7 @@ QtObject { property string relativeFontDirectory: "fonts" function loadFont(url) { - var fontLoader = Qt.createQmlObject('import QtQuick 2.15; FontLoader { source: "' + url + '"; }', + var fontLoader = Qt.createQmlObject('import QtQuick; FontLoader { source: "' + url + '"; }', loader, "dynamicFontLoader"); } diff --git a/NERODevelopment/imports/NERO/EventListModel.qml b/NERODevelopment/imports/NERO/EventListModel.qml index bd5e5c3..c5cf439 100644 --- a/NERODevelopment/imports/NERO/EventListModel.qml +++ b/NERODevelopment/imports/NERO/EventListModel.qml @@ -1,7 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -import QtQuick 6.2 +import QtQuick ListModel { id: eventListModel diff --git a/NERODevelopment/imports/NERO/EventListSimulator.qml b/NERODevelopment/imports/NERO/EventListSimulator.qml index b7724cb..a2250ad 100644 --- a/NERODevelopment/imports/NERO/EventListSimulator.qml +++ b/NERODevelopment/imports/NERO/EventListSimulator.qml @@ -1,9 +1,9 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -import QtQuick 6.2 -import QtQuick.Studio.EventSimulator 1.0 -import QtQuick.Studio.EventSystem 1.0 +import QtQuick +import QtQuick.Studio.EventSimulator +import QtQuick.Studio.EventSystem QtObject { id: simulator diff --git a/NERODevelopment/imports/NERO/Theme.qml b/NERODevelopment/imports/NERO/Theme.qml index fe2b7e8..2f812fb 100644 --- a/NERODevelopment/imports/NERO/Theme.qml +++ b/NERODevelopment/imports/NERO/Theme.qml @@ -1,5 +1,5 @@ pragma Singleton -import QtQuick 6.2 +import QtQuick QtObject { property string currentTheme: "dark"