Skip to content

Standardize QML Imports #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheJeffreyKuo wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Standardize QML Imports #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NERODevelopment/content/App.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions NERODevelopment/content/Arrow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import QtQuick 2.0
import QtQuick.Shapes
import QtQuick
import QtQuick.Shapes
import NERO

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/Battery.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/BatteryValueComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/CriticalFaultIcon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Shapes
import NERO

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/DescriptionModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import NERO

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/DetailDisplay.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Particles
import NERO

Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/DirectionView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/EfficiencyScreen.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Particles
import QtQuick.Layouts

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/FaultDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import NERO

Expand Down
6 changes: 2 additions & 4 deletions NERODevelopment/content/FlappyBird.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/HeaderView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/HomeIcon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/HomeMenuItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import NERO

Rectangle {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/LabelText.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Text {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/LabeledComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/Lightning.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Shapes
import NERO

Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/MaxDrawGraph.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/MaxSpeedComparator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Rectangle {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/MicrophoneComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import Qt5Compat.GraphicalEffects
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/NavigationController.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts
import NERO

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/NonCriticalWarning.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Item {
Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/OffScreen.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/OffScreen2.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/Pit.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

import NERO
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/Radial.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.11
import QtQuick.Shapes 1.15
import QtQuick
import QtQuick.Shapes
import NERO

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/RunInfo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/Snake.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls

Rectangle {
id: snakeGame
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/SnakeBody.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls

Item {
id: food
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/SnakeFood.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls

Item {
id: food
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/Spacer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/SpeedMode.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

import NERO
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/StatusDisplay.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import QtQuick.Particles
import NERO

Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/SubMenuIcon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/Tank.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Studio.DesignEffects

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/TankIcon.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick

Item {
id: tankIcon
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/Thermometer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 6.5
import QtQuick.Controls 6.5
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/ThermometerValueComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts
import NERO

Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/content/TimerDisplay.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/TorqueAdj.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/TorqueValueComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts
import NERO

Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/content/ValueDisplay.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick
import QtQuick.Layouts

Item {
Expand Down
4 changes: 2 additions & 2 deletions NERODevelopment/content/ValueText.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick
import QtQuick.Controls
import NERO

Text {
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/imports/NERO/Constants.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pragma Singleton
import QtQuick 6.2
import QtQuick
import QtQuick.Studio.Application

QtObject {
Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/imports/NERO/DirectoryFontLoader.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/imports/NERO/EventListModel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions NERODevelopment/imports/NERO/EventListSimulator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/imports/NERO/Theme.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pragma Singleton
import QtQuick 6.2
import QtQuick

QtObject {
property string currentTheme: "dark"
Expand Down