From e831f488d39de4ecefa558d0ae341e07024a26a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maksymilian=20=C5=81owczy=C5=84ski?= Date: Sat, 20 Jan 2024 19:34:15 +0100 Subject: [PATCH] update imports make functions and QtQuick imports consistent --- qmlui/qml/+qt5/ActionsMenu.qml | 10 +++++----- qmlui/qml/ActionsMenu.qml | 10 ++++------ qmlui/qml/BeatGeneratorsPanel.qml | 7 +++---- qmlui/qml/ChannelToolLoader.qml | 5 ++--- qmlui/qml/ChaserStepDelegate.qml | 5 ++--- qmlui/qml/ChaserWidget.qml | 7 +++---- qmlui/qml/ColorTool.qml | 7 +++---- qmlui/qml/ColorToolBasic.qml | 3 +-- qmlui/qml/ColorToolFilters.qml | 7 +++---- qmlui/qml/ColorToolFull.qml | 7 +++---- qmlui/qml/ColorToolPrimary.qml | 3 +-- qmlui/qml/ContextMenuEntry.qml | 4 +--- qmlui/qml/CustomCheckBox.qml | 6 ++---- qmlui/qml/CustomComboBox.qml | 7 +++---- qmlui/qml/CustomDoubleSpinBox.qml | 9 ++++----- qmlui/qml/CustomScrollBar.qml | 5 ++--- qmlui/qml/CustomSlider.qml | 5 ++--- qmlui/qml/CustomSpinBox.qml | 9 ++++----- qmlui/qml/CustomTextEdit.qml | 5 ++--- qmlui/qml/CustomTextInput.qml | 3 +-- qmlui/qml/DMXAddressTool.qml | 5 ++--- qmlui/qml/DMXAddressWidget.qml | 4 ++-- qmlui/qml/DMXPercentageButton.qml | 3 +-- qmlui/qml/DayTimeTool.qml | 4 ++-- qmlui/qml/ExternalControlDelegate.qml | 5 ++--- qmlui/qml/ExternalControls.qml | 5 ++--- qmlui/qml/FixtureConsole.qml | 5 ++--- qmlui/qml/FixtureDelegate.qml | 5 ++--- qmlui/qml/FontAwesomeVariables.qml | 2 +- qmlui/qml/FunctionDelegate.qml | 9 ++++----- qmlui/qml/GenericButton.qml | 3 +-- qmlui/qml/GenericMultiDragItem.qml | 3 +-- qmlui/qml/IconButton.qml | 5 ++--- qmlui/qml/IconPopupButton.qml | 5 ++--- qmlui/qml/IconTextEntry.qml | 5 ++--- qmlui/qml/InputChannelDelegate.qml | 5 ++--- qmlui/qml/KeyPad.qml | 5 ++--- qmlui/qml/KeyboardSequenceDelegate.qml | 5 ++--- qmlui/qml/MainView.qml | 6 +++--- qmlui/qml/MenuBarEntry.qml | 5 ++--- qmlui/qml/MultiColorBox.qml | 3 +-- qmlui/qml/PaletteFanningBox.qml | 7 +++---- qmlui/qml/QLCPlusFader.qml | 5 ++--- qmlui/qml/QLCPlusKnob.qml | 5 ++--- qmlui/qml/RobotoText.qml | 3 +-- qmlui/qml/SectionBox.qml | 3 +-- qmlui/qml/SidePanel.qml | 3 +-- qmlui/qml/SimpleDesk.qml | 11 +++++------ qmlui/qml/SingleAxisTool.qml | 5 ++--- qmlui/qml/TimeEditTool.qml | 5 ++--- qmlui/qml/TreeNodeDelegate.qml | 7 +++---- qmlui/qml/UISettings.qml | 2 +- qmlui/qml/UISettingsEditor.qml | 7 +++---- qmlui/qml/UsageList.qml | 5 ++--- qmlui/qml/WidgetDelegate.qml | 3 +-- qmlui/qml/WindowLoader.qml | 3 +-- qmlui/qml/ZoomItem.qml | 3 +-- qmlui/qml/fixtureeditor/ChannelEditor.qml | 7 +++---- qmlui/qml/fixtureeditor/EditorView.qml | 7 +++---- qmlui/qml/fixtureeditor/FixtureEditor.qml | 7 +++---- qmlui/qml/fixtureeditor/ModeEditor.qml | 7 +++---- qmlui/qml/fixtureeditor/PhysicalProperties.qml | 7 +++---- qmlui/qml/fixturesfunctions/+qt5/RightPanel.qml | 6 +++--- .../fixturesfunctions/+qt5/SettingsView2D.qml | 5 ++--- qmlui/qml/fixturesfunctions/2DView.qml | 15 +++++++-------- .../3DView/+qt5/SettingsView3D.qml | 6 +++--- qmlui/qml/fixturesfunctions/3DView/3DView.qml | 8 +++----- .../3DView/3DViewUnsupported.qml | 3 +-- .../qml/fixturesfunctions/3DView/BlitEffect.qml | 4 ++-- .../qml/fixturesfunctions/3DView/BlitFilter.qml | 7 +++---- .../3DView/DeferredRenderer.qml | 7 +++---- .../qml/fixturesfunctions/3DView/DepthTarget.qml | 4 ++-- .../3DView/DirectionalLightFilter.qml | 7 +++---- .../3DView/DownsampleEffect.qml | 4 ++-- .../3DView/DownsampleFilter.qml | 2 +- .../qml/fixturesfunctions/3DView/FXAAEffect.qml | 4 ++-- .../qml/fixturesfunctions/3DView/FXAAFilter.qml | 7 +++---- .../3DView/FillGBufferFilter.qml | 7 +++---- .../fixturesfunctions/3DView/Fixture3DItem.qml | 4 ++-- .../qml/fixturesfunctions/3DView/FrameTarget.qml | 4 ++-- qmlui/qml/fixturesfunctions/3DView/GBuffer.qml | 4 ++-- .../3DView/GammaCorrectEffect.qml | 4 ++-- .../3DView/GammaCorrectFilter.qml | 7 +++---- .../fixturesfunctions/3DView/Generic3DItem.qml | 13 ++++++------- .../3DView/GenericScreenQuadEntity.qml | 8 ++++---- .../3DView/GeometryPassEffect.qml | 4 ++-- .../3DView/GrabBrightEffect.qml | 4 ++-- .../3DView/GrabBrightFilter.qml | 7 +++---- .../qml/fixturesfunctions/3DView/LightEntity.qml | 9 ++++----- .../fixturesfunctions/3DView/LightPassEffect.qml | 4 ++-- .../3DView/MultiBeams3DItem.qml | 11 +++++------ .../3DView/OutputFrontDepthEffect.qml | 4 ++-- .../3DView/OutputFrontDepthFilter.qml | 7 +++---- .../fixturesfunctions/3DView/PixelBar3DItem.qml | 13 ++++++------- .../3DView/RenderSelectionBoxesFilter.qml | 7 +++---- .../3DView/RenderShadowMapFilter.qml | 7 +++---- .../qml/fixturesfunctions/3DView/SceneEntity.qml | 10 +++++----- .../3DView/ScreenQuadEntity.qml | 8 ++++---- .../3DView/ScreenQuadGammaCorrectEntity.qml | 8 ++++---- .../fixturesfunctions/3DView/SelectionEntity.qml | 4 ++-- .../fixturesfunctions/3DView/SettingsView3D.qml | 7 +++---- .../3DView/SpotlightConeEntity.qml | 10 +++++----- .../3DView/SpotlightScatteringEffect.qml | 4 ++-- .../3DView/SpotlightScatteringFilter.qml | 7 +++---- .../3DView/SpotlightShadingEffect.qml | 4 ++-- .../3DView/SpotlightShadingFilter.qml | 7 +++---- qmlui/qml/fixturesfunctions/3DView/StageBox.qml | 16 ++++++++-------- qmlui/qml/fixturesfunctions/3DView/StageRock.qml | 12 ++++++------ .../qml/fixturesfunctions/3DView/StageSimple.qml | 10 +++++----- .../fixturesfunctions/3DView/StageTheatre.qml | 12 ++++++------ .../fixturesfunctions/3DView/UpsampleEffect.qml | 4 ++-- .../fixturesfunctions/3DView/UpsampleFilter.qml | 2 +- qmlui/qml/fixturesfunctions/AddFunctionMenu.qml | 5 ++--- qmlui/qml/fixturesfunctions/AudioEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/BeamTool.qml | 5 ++--- qmlui/qml/fixturesfunctions/BottomPanel.qml | 3 +-- qmlui/qml/fixturesfunctions/ChaserEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/CollectionEditor.qml | 7 +++---- .../CollectionFunctionDelegate.qml | 3 +-- qmlui/qml/fixturesfunctions/DMXView.qml | 5 ++--- qmlui/qml/fixturesfunctions/EFXEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/EFXPreview.qml | 3 +-- qmlui/qml/fixturesfunctions/EditorTopBar.qml | 5 ++--- qmlui/qml/fixturesfunctions/Fixture2DItem.qml | 5 ++--- qmlui/qml/fixturesfunctions/FixtureBrowser.qml | 11 +++++------ .../fixturesfunctions/FixtureBrowserDelegate.qml | 11 +++++------ .../fixturesfunctions/FixtureChannelDelegate.qml | 7 +++---- qmlui/qml/fixturesfunctions/FixtureDMXItem.qml | 3 +-- qmlui/qml/fixturesfunctions/FixtureDragItem.qml | 3 +-- .../qml/fixturesfunctions/FixtureGroupEditor.qml | 7 +++---- .../fixturesfunctions/FixtureGroupManager.qml | 7 +++---- .../fixturesfunctions/FixtureHeadDelegate.qml | 3 +-- .../fixturesfunctions/FixtureNodeDelegate.qml | 5 ++--- .../qml/fixturesfunctions/FixtureProperties.qml | 7 +++---- qmlui/qml/fixturesfunctions/FixtureSummary.qml | 5 ++--- .../fixturesfunctions/FixturesAndFunctions.qml | 7 +++---- qmlui/qml/fixturesfunctions/FunctionManager.qml | 7 +++---- qmlui/qml/fixturesfunctions/GridEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/IntensityTool.qml | 7 +++---- qmlui/qml/fixturesfunctions/LeftPanel.qml | 9 ++++----- qmlui/qml/fixturesfunctions/PaletteManager.qml | 7 +++---- qmlui/qml/fixturesfunctions/PositionTool.qml | 5 ++--- .../fixturesfunctions/PresetCapabilityItem.qml | 3 +-- qmlui/qml/fixturesfunctions/PresetsTool.qml | 3 +-- qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/RGBMatrixPreview.qml | 3 +-- .../qml/fixturesfunctions/RGBPanelProperties.qml | 5 ++--- qmlui/qml/fixturesfunctions/RightPanel.qml | 7 +++---- qmlui/qml/fixturesfunctions/SceneEditor.qml | 9 ++++----- .../fixturesfunctions/SceneFixtureConsole.qml | 5 ++--- qmlui/qml/fixturesfunctions/ScriptEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/SequenceEditor.qml | 7 +++---- qmlui/qml/fixturesfunctions/SettingsView2D.qml | 5 ++--- qmlui/qml/fixturesfunctions/SettingsViewDMX.qml | 5 ++--- qmlui/qml/fixturesfunctions/ShutterAnimator.qml | 3 +-- qmlui/qml/fixturesfunctions/UniverseGridView.qml | 5 ++--- qmlui/qml/fixturesfunctions/UniverseSummary.qml | 5 ++--- qmlui/qml/fixturesfunctions/VideoContext.qml | 3 +-- qmlui/qml/fixturesfunctions/VideoEditor.qml | 7 +++---- qmlui/qml/inputoutput/AudioCardsList.qml | 3 +-- qmlui/qml/inputoutput/AudioDeviceItem.qml | 3 +-- qmlui/qml/inputoutput/AudioIOItem.qml | 3 +-- qmlui/qml/inputoutput/IOLeftPanel.qml | 5 ++--- qmlui/qml/inputoutput/IORightPanel.qml | 5 ++--- qmlui/qml/inputoutput/InputOutputManager.qml | 5 ++--- qmlui/qml/inputoutput/InputPatchItem.qml | 5 ++--- qmlui/qml/inputoutput/InputProfileEditor.qml | 7 +++---- qmlui/qml/inputoutput/OutputPatchItem.qml | 5 ++--- qmlui/qml/inputoutput/PatchWireBox.qml | 3 +-- qmlui/qml/inputoutput/PluginDragItem.qml | 3 +-- qmlui/qml/inputoutput/PluginsList.qml | 3 +-- qmlui/qml/inputoutput/ProfilesList.qml | 7 +++---- qmlui/qml/inputoutput/UniverseIOItem.qml | 3 +-- qmlui/qml/popup/CustomPopupDialog.qml | 9 ++++----- qmlui/qml/popup/PopupAbout.qml | 7 +++---- qmlui/qml/popup/PopupChannelModifiers.qml | 7 +++---- qmlui/qml/popup/PopupChannelWizard.qml | 7 +++---- qmlui/qml/popup/PopupCreatePalette.qml | 7 +++---- qmlui/qml/popup/PopupDMXDump.qml | 7 +++---- qmlui/qml/popup/PopupDisclaimer.qml | 7 +++---- qmlui/qml/popup/PopupFolderBrowser.qml | 7 +++---- qmlui/qml/popup/PopupImportProject.qml | 7 +++---- qmlui/qml/popup/PopupInputChannelEditor.qml | 7 +++---- qmlui/qml/popup/PopupManualInputSource.qml | 7 +++---- qmlui/qml/popup/PopupMonitor.qml | 7 +++---- qmlui/qml/popup/PopupNetworkClient.qml | 7 +++---- qmlui/qml/popup/PopupNetworkConnect.qml | 5 ++--- qmlui/qml/popup/PopupNetworkServer.qml | 5 ++--- qmlui/qml/popup/PopupPINRequest.qml | 5 ++--- qmlui/qml/popup/PopupPINSetup.qml | 5 ++--- qmlui/qml/popup/PopupRenameItems.qml | 5 ++--- qmlui/qml/showmanager/HeaderAndCursor.qml | 5 ++--- qmlui/qml/showmanager/ShowItem.qml | 5 ++--- qmlui/qml/showmanager/ShowManager.qml | 11 +++++------ qmlui/qml/showmanager/TrackDelegate.qml | 3 +-- qmlui/qml/virtualconsole/VCButtonItem.qml | 4 ++-- qmlui/qml/virtualconsole/VCButtonProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VCClockItem.qml | 5 ++--- qmlui/qml/virtualconsole/VCClockProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VCCueListItem.qml | 6 +++--- qmlui/qml/virtualconsole/VCCueListProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VCFrameItem.qml | 5 ++--- qmlui/qml/virtualconsole/VCFrameProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VCLabelItem.qml | 2 +- qmlui/qml/virtualconsole/VCPageArea.qml | 4 ++-- qmlui/qml/virtualconsole/VCPageProperties.qml | 5 ++--- qmlui/qml/virtualconsole/VCRightPanel.qml | 5 ++--- qmlui/qml/virtualconsole/VCSliderItem.qml | 5 ++--- qmlui/qml/virtualconsole/VCSliderProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VCWidgetItem.qml | 3 +-- qmlui/qml/virtualconsole/VCWidgetProperties.qml | 7 +++---- qmlui/qml/virtualconsole/VirtualConsole.qml | 7 +++---- qmlui/qml/virtualconsole/WidgetDragItem.qml | 3 +-- qmlui/qml/virtualconsole/WidgetsList.qml | 5 ++--- qmlui/uimanager.cpp | 2 +- 215 files changed, 535 insertions(+), 714 deletions(-) diff --git a/qmlui/qml/+qt5/ActionsMenu.qml b/qmlui/qml/+qt5/ActionsMenu.qml index 5d1efcc648..444eaee32a 100644 --- a/qmlui/qml/+qt5/ActionsMenu.qml +++ b/qmlui/qml/+qt5/ActionsMenu.qml @@ -17,10 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 -import QtQuick.Dialogs 1.2 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Dialogs 1.3 +import QtQuick.Layouts 1.15 Popup { @@ -131,7 +131,7 @@ Popup property string action: "" - onClicked: function (role) { + onClicked: (role) => { if (role === Dialog.Yes) { if (qlcplus.fileName()) diff --git a/qmlui/qml/ActionsMenu.qml b/qmlui/qml/ActionsMenu.qml index 082f747a40..0dc1df16b3 100644 --- a/qmlui/qml/ActionsMenu.qml +++ b/qmlui/qml/ActionsMenu.qml @@ -17,12 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import QtQuick.Dialogs -import QtQuick.Layouts 1.0 - -import "." +import QtQuick.Layouts 1.15 Popup { @@ -133,7 +131,7 @@ Popup property string action: "" - onClicked: function (role) { + onClicked: (role) => { if (role === Dialog.Yes) { if (qlcplus.fileName()) diff --git a/qmlui/qml/BeatGeneratorsPanel.qml b/qmlui/qml/BeatGeneratorsPanel.qml index 6c2a4b9d59..9b570d9278 100644 --- a/qmlui/qml/BeatGeneratorsPanel.qml +++ b/qmlui/qml/BeatGeneratorsPanel.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 Rectangle { diff --git a/qmlui/qml/ChannelToolLoader.qml b/qmlui/qml/ChannelToolLoader.qml index 011b41d81a..beaf28dccc 100644 --- a/qmlui/qml/ChannelToolLoader.qml +++ b/qmlui/qml/ChannelToolLoader.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.5 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Popup { diff --git a/qmlui/qml/ChaserStepDelegate.qml b/qmlui/qml/ChaserStepDelegate.qml index 4a0fa58c3a..2cf6c2c5e1 100644 --- a/qmlui/qml/ChaserStepDelegate.qml +++ b/qmlui/qml/ChaserStepDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/ChaserWidget.qml b/qmlui/qml/ChaserWidget.qml index 65f55ef238..f6336bd3fe 100644 --- a/qmlui/qml/ChaserWidget.qml +++ b/qmlui/qml/ChaserWidget.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.12 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Column { diff --git a/qmlui/qml/ColorTool.qml b/qmlui/qml/ColorTool.qml index 7cbd048994..6383a1702e 100644 --- a/qmlui/qml/ColorTool.qml +++ b/qmlui/qml/ColorTool.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/ColorToolBasic.qml b/qmlui/qml/ColorToolBasic.qml index ac0c172a4a..f0cf97d0d7 100644 --- a/qmlui/qml/ColorToolBasic.qml +++ b/qmlui/qml/ColorToolBasic.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/ColorToolFilters.qml b/qmlui/qml/ColorToolFilters.qml index d8c732bc08..8436ece69b 100644 --- a/qmlui/qml/ColorToolFilters.qml +++ b/qmlui/qml/ColorToolFilters.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/ColorToolFull.qml b/qmlui/qml/ColorToolFull.qml index 1d9af3b3aa..cd1f0a0e88 100644 --- a/qmlui/qml/ColorToolFull.qml +++ b/qmlui/qml/ColorToolFull.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/ColorToolPrimary.qml b/qmlui/qml/ColorToolPrimary.qml index f3be683beb..ddaddc4691 100644 --- a/qmlui/qml/ColorToolPrimary.qml +++ b/qmlui/qml/ColorToolPrimary.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/ContextMenuEntry.qml b/qmlui/qml/ContextMenuEntry.qml index 748c6aaac6..988a8e652d 100644 --- a/qmlui/qml/ContextMenuEntry.qml +++ b/qmlui/qml/ContextMenuEntry.qml @@ -17,9 +17,7 @@ limitations under the License. */ -import QtQuick 2.2 - -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/CustomCheckBox.qml b/qmlui/qml/CustomCheckBox.qml index 7c0218f26e..f97ec2204a 100644 --- a/qmlui/qml/CustomCheckBox.qml +++ b/qmlui/qml/CustomCheckBox.qml @@ -17,10 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.14 - -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 RadioButton { diff --git a/qmlui/qml/CustomComboBox.qml b/qmlui/qml/CustomComboBox.qml index e2e174e6a2..d01930da79 100644 --- a/qmlui/qml/CustomComboBox.qml +++ b/qmlui/qml/CustomComboBox.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.9 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.14 -import "." +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Controls 2.15 ComboBox { diff --git a/qmlui/qml/CustomDoubleSpinBox.qml b/qmlui/qml/CustomDoubleSpinBox.qml index f60fe2a02b..422705d7b5 100644 --- a/qmlui/qml/CustomDoubleSpinBox.qml +++ b/qmlui/qml/CustomDoubleSpinBox.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Controls 2.14 -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 CustomSpinBox { @@ -41,11 +40,11 @@ CustomSpinBox top: Math.max(controlRoot.from, controlRoot.to) } - textFromValue: function(value, locale) { + textFromValue: (value, locale) => { return Number(value / Math.pow(10, decimals)).toLocaleString(locale, 'f', decimals) + suffix } - valueFromText: function(text, locale) { + valueFromText: (text, locale) => { return Number.fromLocaleString(locale, text.replace(suffix, "")) * Math.pow(10, decimals) } diff --git a/qmlui/qml/CustomScrollBar.qml b/qmlui/qml/CustomScrollBar.qml index 797e45b09b..9022d7ade4 100644 --- a/qmlui/qml/CustomScrollBar.qml +++ b/qmlui/qml/CustomScrollBar.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." ScrollBar { diff --git a/qmlui/qml/CustomSlider.qml b/qmlui/qml/CustomSlider.qml index d7ec8f5d06..d3737b5287 100644 --- a/qmlui/qml/CustomSlider.qml +++ b/qmlui/qml/CustomSlider.qml @@ -18,9 +18,8 @@ limitations under the License. */ -import QtQuick 2.9 -import QtQuick.Controls 2.14 -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 Slider { diff --git a/qmlui/qml/CustomSpinBox.qml b/qmlui/qml/CustomSpinBox.qml index 79e61598f9..7c552881c4 100644 --- a/qmlui/qml/CustomSpinBox.qml +++ b/qmlui/qml/CustomSpinBox.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Controls 2.14 -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 SpinBox { @@ -49,11 +48,11 @@ SpinBox if (focus) contentItem.selectAll() } - textFromValue: function(value) { + textFromValue: (value) => { return value + suffix } - valueFromText: function(text) { + valueFromText: (text) => { return parseInt(text.replace(suffix, "")) } diff --git a/qmlui/qml/CustomTextEdit.qml b/qmlui/qml/CustomTextEdit.qml index 06b0053532..4bf459faa0 100644 --- a/qmlui/qml/CustomTextEdit.qml +++ b/qmlui/qml/CustomTextEdit.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.7 -import QtQuick.Controls 2.14 -import "." +import QtQuick 2.15 +import QtQuick.Controls 2.15 TextField { diff --git a/qmlui/qml/CustomTextInput.qml b/qmlui/qml/CustomTextInput.qml index de0f28483a..37eaefa7f3 100644 --- a/qmlui/qml/CustomTextInput.qml +++ b/qmlui/qml/CustomTextInput.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.7 -import "." +import QtQuick 2.15 TextInput { diff --git a/qmlui/qml/DMXAddressTool.qml b/qmlui/qml/DMXAddressTool.qml index 3d1e92fbca..aea90463c6 100644 --- a/qmlui/qml/DMXAddressTool.qml +++ b/qmlui/qml/DMXAddressTool.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 -import "." GridLayout { diff --git a/qmlui/qml/DMXAddressWidget.qml b/qmlui/qml/DMXAddressWidget.qml index a6c482f4bc..f18737fe07 100644 --- a/qmlui/qml/DMXAddressWidget.qml +++ b/qmlui/qml/DMXAddressWidget.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 Rectangle { diff --git a/qmlui/qml/DMXPercentageButton.qml b/qmlui/qml/DMXPercentageButton.qml index 7e7236ce22..1ad31525ab 100644 --- a/qmlui/qml/DMXPercentageButton.qml +++ b/qmlui/qml/DMXPercentageButton.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/DayTimeTool.qml b/qmlui/qml/DayTimeTool.qml index c48a4f4e54..6ca7ca5deb 100644 --- a/qmlui/qml/DayTimeTool.qml +++ b/qmlui/qml/DayTimeTool.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 Rectangle { diff --git a/qmlui/qml/ExternalControlDelegate.qml b/qmlui/qml/ExternalControlDelegate.qml index ea01b2bc72..a2eee4a674 100644 --- a/qmlui/qml/ExternalControlDelegate.qml +++ b/qmlui/qml/ExternalControlDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Column { diff --git a/qmlui/qml/ExternalControls.qml b/qmlui/qml/ExternalControls.qml index fb38d1a6bb..d325d3679b 100644 --- a/qmlui/qml/ExternalControls.qml +++ b/qmlui/qml/ExternalControls.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Column { diff --git a/qmlui/qml/FixtureConsole.qml b/qmlui/qml/FixtureConsole.qml index 0ab730f138..b7430fc85b 100644 --- a/qmlui/qml/FixtureConsole.qml +++ b/qmlui/qml/FixtureConsole.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/FixtureDelegate.qml b/qmlui/qml/FixtureDelegate.qml index 2dc46f3d0e..62fa5e8762 100644 --- a/qmlui/qml/FixtureDelegate.qml +++ b/qmlui/qml/FixtureDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/FontAwesomeVariables.qml b/qmlui/qml/FontAwesomeVariables.qml index 69d0c35ade..d66e377cf8 100644 --- a/qmlui/qml/FontAwesomeVariables.qml +++ b/qmlui/qml/FontAwesomeVariables.qml @@ -29,7 +29,7 @@ pragma Singleton -import QtQuick 2.0 +import QtQuick 2.15 QtObject { diff --git a/qmlui/qml/FunctionDelegate.qml b/qmlui/qml/FunctionDelegate.qml index 56c1688f73..dfabb50b32 100644 --- a/qmlui/qml/FunctionDelegate.qml +++ b/qmlui/qml/FunctionDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { @@ -103,13 +102,13 @@ Rectangle drag.target: dragItem - onPressed: function(mouse) { + onPressed: (mouse) => { funcDelegate.mouseEvent(App.Pressed, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } - onClicked: function(mouse) { + onClicked: (mouse) => { funcDelegate.mouseEvent(App.Clicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } - onDoubleClicked: function(mouse) { + onDoubleClicked: (mouse) => { funcDelegate.mouseEvent(App.DoubleClicked, cRef.id, cRef.type, funcDelegate, mouse.modifiers) } } diff --git a/qmlui/qml/GenericButton.qml b/qmlui/qml/GenericButton.qml index ce56ada487..2e53b44bfe 100644 --- a/qmlui/qml/GenericButton.qml +++ b/qmlui/qml/GenericButton.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import "." Rectangle { diff --git a/qmlui/qml/GenericMultiDragItem.qml b/qmlui/qml/GenericMultiDragItem.qml index e3ca4e4759..43b2416cfb 100644 --- a/qmlui/qml/GenericMultiDragItem.qml +++ b/qmlui/qml/GenericMultiDragItem.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Item { diff --git a/qmlui/qml/IconButton.qml b/qmlui/qml/IconButton.qml index 1d0ee23404..bd8780e6c5 100644 --- a/qmlui/qml/IconButton.qml +++ b/qmlui/qml/IconButton.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Button { diff --git a/qmlui/qml/IconPopupButton.qml b/qmlui/qml/IconPopupButton.qml index 806abb7b3c..04fdac5e61 100644 --- a/qmlui/qml/IconPopupButton.qml +++ b/qmlui/qml/IconPopupButton.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." CustomComboBox { diff --git a/qmlui/qml/IconTextEntry.qml b/qmlui/qml/IconTextEntry.qml index e997a1dd5a..270f4901df 100644 --- a/qmlui/qml/IconTextEntry.qml +++ b/qmlui/qml/IconTextEntry.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/InputChannelDelegate.qml b/qmlui/qml/InputChannelDelegate.qml index 9068c6c6ce..b03e5e8c67 100644 --- a/qmlui/qml/InputChannelDelegate.qml +++ b/qmlui/qml/InputChannelDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/KeyPad.qml b/qmlui/qml/KeyPad.qml index 49bfdc6ba7..5c6d3e316a 100644 --- a/qmlui/qml/KeyPad.qml +++ b/qmlui/qml/KeyPad.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 -import "." Rectangle { diff --git a/qmlui/qml/KeyboardSequenceDelegate.qml b/qmlui/qml/KeyboardSequenceDelegate.qml index 6f61848ef5..6c0ed607d6 100644 --- a/qmlui/qml/KeyboardSequenceDelegate.qml +++ b/qmlui/qml/KeyboardSequenceDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Column { diff --git a/qmlui/qml/MainView.qml b/qmlui/qml/MainView.qml index e1650cfec6..ad79215472 100644 --- a/qmlui/qml/MainView.qml +++ b/qmlui/qml/MainView.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/MenuBarEntry.qml b/qmlui/qml/MenuBarEntry.qml index 4702143d50..ea6ff3aebe 100644 --- a/qmlui/qml/MenuBarEntry.qml +++ b/qmlui/qml/MenuBarEntry.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Button { diff --git a/qmlui/qml/MultiColorBox.qml b/qmlui/qml/MultiColorBox.qml index 97174d4c1b..5948b361e9 100644 --- a/qmlui/qml/MultiColorBox.qml +++ b/qmlui/qml/MultiColorBox.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import "." Rectangle { diff --git a/qmlui/qml/PaletteFanningBox.qml b/qmlui/qml/PaletteFanningBox.qml index 393b82fe63..cd2baae9a1 100644 --- a/qmlui/qml/PaletteFanningBox.qml +++ b/qmlui/qml/PaletteFanningBox.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Item { diff --git a/qmlui/qml/QLCPlusFader.qml b/qmlui/qml/QLCPlusFader.qml index 511336566a..320959edd0 100644 --- a/qmlui/qml/QLCPlusFader.qml +++ b/qmlui/qml/QLCPlusFader.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Slider { diff --git a/qmlui/qml/QLCPlusKnob.qml b/qmlui/qml/QLCPlusKnob.qml index f9b1de0c46..0d9b2bb094 100644 --- a/qmlui/qml/QLCPlusKnob.qml +++ b/qmlui/qml/QLCPlusKnob.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import "CanvasDrawFunctions.js" as DrawFuncs -import "." Dial { diff --git a/qmlui/qml/RobotoText.qml b/qmlui/qml/RobotoText.qml index a5dd4a1b6a..2ae198df27 100644 --- a/qmlui/qml/RobotoText.qml +++ b/qmlui/qml/RobotoText.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/SectionBox.qml b/qmlui/qml/SectionBox.qml index c9dc4a4347..de92b727b5 100644 --- a/qmlui/qml/SectionBox.qml +++ b/qmlui/qml/SectionBox.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/SidePanel.qml b/qmlui/qml/SidePanel.qml index 84df2897c0..2eebcf4b2d 100644 --- a/qmlui/qml/SidePanel.qml +++ b/qmlui/qml/SidePanel.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.14 +import QtQuick 2.15 -import "." Rectangle { diff --git a/qmlui/qml/SimpleDesk.qml b/qmlui/qml/SimpleDesk.qml index 520ce430ab..1f31b6cc96 100644 --- a/qmlui/qml/SimpleDesk.qml +++ b/qmlui/qml/SimpleDesk.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { @@ -39,7 +38,7 @@ Rectangle id: channelToolLoader z: 2 - onValueChanged: function (fixtureID, channelIndex, value) { + onValueChanged: (fixtureID, channelIndex, value) => { simpleDesk.setValue(fixtureID, channelIndex, value) } } @@ -87,7 +86,7 @@ Rectangle padding: 0 model: simpleDesk.universesListModel currValue: simpleDesk.universeFilter - onValueChanged: function (value) { + onValueChanged: (value) => { simpleDesk.universeFilter = value } } diff --git a/qmlui/qml/SingleAxisTool.qml b/qmlui/qml/SingleAxisTool.qml index 965492cd8f..41e1df67f5 100644 --- a/qmlui/qml/SingleAxisTool.qml +++ b/qmlui/qml/SingleAxisTool.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/TimeEditTool.qml b/qmlui/qml/TimeEditTool.qml index 748996ac06..0901953748 100644 --- a/qmlui/qml/TimeEditTool.qml +++ b/qmlui/qml/TimeEditTool.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." GridLayout { diff --git a/qmlui/qml/TreeNodeDelegate.qml b/qmlui/qml/TreeNodeDelegate.qml index 4bdfb4da5c..8178764cb5 100644 --- a/qmlui/qml/TreeNodeDelegate.qml +++ b/qmlui/qml/TreeNodeDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.2 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Column { @@ -125,11 +124,11 @@ Column drag.target: dragItem - onPressed: function (mouse) { + onPressed: (mouse) => { nodeContainer.mouseEvent(App.Pressed, cRef ? cRef.id : -1, nodeContainer.itemType, nodeContainer, mouse.modifiers) } - onClicked: function (mouse) { + onClicked: (mouse) => { nodeLabel.forceActiveFocus() nodeContainer.mouseEvent(App.Clicked, cRef ? cRef.id : -1, nodeContainer.itemType, nodeContainer, mouse.modifiers) diff --git a/qmlui/qml/UISettings.qml b/qmlui/qml/UISettings.qml index 8318576475..ab46564f42 100644 --- a/qmlui/qml/UISettings.qml +++ b/qmlui/qml/UISettings.qml @@ -19,7 +19,7 @@ pragma Singleton -import QtQuick 2.0 +import QtQuick 2.15 QtObject { diff --git a/qmlui/qml/UISettingsEditor.qml b/qmlui/qml/UISettingsEditor.qml index 664a6b9595..d0daac8b2f 100644 --- a/qmlui/qml/UISettingsEditor.qml +++ b/qmlui/qml/UISettingsEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/UsageList.qml b/qmlui/qml/UsageList.qml index b4656e4e48..8707eae86d 100644 --- a/qmlui/qml/UsageList.qml +++ b/qmlui/qml/UsageList.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/WidgetDelegate.qml b/qmlui/qml/WidgetDelegate.qml index f48be6b834..f4b965ba63 100644 --- a/qmlui/qml/WidgetDelegate.qml +++ b/qmlui/qml/WidgetDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/WindowLoader.qml b/qmlui/qml/WindowLoader.qml index 630df62b69..186ff81f54 100644 --- a/qmlui/qml/WindowLoader.qml +++ b/qmlui/qml/WindowLoader.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.1 +import QtQuick 2.15 -import "." /** This is a wrapper item to achieve 3 things: * 1) load a detached context on a surface with the application background diff --git a/qmlui/qml/ZoomItem.qml b/qmlui/qml/ZoomItem.qml index 20e5eaa82b..62c3133201 100644 --- a/qmlui/qml/ZoomItem.qml +++ b/qmlui/qml/ZoomItem.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import "." Rectangle { diff --git a/qmlui/qml/fixtureeditor/ChannelEditor.qml b/qmlui/qml/fixtureeditor/ChannelEditor.qml index 31949d265f..7073332b72 100644 --- a/qmlui/qml/fixtureeditor/ChannelEditor.qml +++ b/qmlui/qml/fixtureeditor/ChannelEditor.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import QtQuick.Dialogs import org.qlcplus.classes 1.0 -import "." GridLayout { diff --git a/qmlui/qml/fixtureeditor/EditorView.qml b/qmlui/qml/fixtureeditor/EditorView.qml index 12eb525884..64e51a9829 100644 --- a/qmlui/qml/fixtureeditor/EditorView.qml +++ b/qmlui/qml/fixtureeditor/EditorView.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixtureeditor/FixtureEditor.qml b/qmlui/qml/fixtureeditor/FixtureEditor.qml index 7e8df98125..0ff7223cbc 100644 --- a/qmlui/qml/fixtureeditor/FixtureEditor.qml +++ b/qmlui/qml/fixtureeditor/FixtureEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import QtQuick.Dialogs import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixtureeditor/ModeEditor.qml b/qmlui/qml/fixtureeditor/ModeEditor.qml index d3e05b8e1d..4560f7d723 100644 --- a/qmlui/qml/fixtureeditor/ModeEditor.qml +++ b/qmlui/qml/fixtureeditor/ModeEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixtureeditor/PhysicalProperties.qml b/qmlui/qml/fixtureeditor/PhysicalProperties.qml index f7e6f5bfbd..b80287e4f1 100644 --- a/qmlui/qml/fixtureeditor/PhysicalProperties.qml +++ b/qmlui/qml/fixtureeditor/PhysicalProperties.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.4 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." GridLayout { diff --git a/qmlui/qml/fixturesfunctions/+qt5/RightPanel.qml b/qmlui/qml/fixturesfunctions/+qt5/RightPanel.qml index a4f4bfde88..7bc1afb17a 100644 --- a/qmlui/qml/fixturesfunctions/+qt5/RightPanel.qml +++ b/qmlui/qml/fixturesfunctions/+qt5/RightPanel.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Dialogs 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Dialogs 1.3 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/fixturesfunctions/+qt5/SettingsView2D.qml b/qmlui/qml/fixturesfunctions/+qt5/SettingsView2D.qml index e801e2f318..18e3c5d5a7 100644 --- a/qmlui/qml/fixturesfunctions/+qt5/SettingsView2D.qml +++ b/qmlui/qml/fixturesfunctions/+qt5/SettingsView2D.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs 1.3 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/2DView.qml b/qmlui/qml/fixturesfunctions/2DView.qml index 7f4023007c..6772994867 100644 --- a/qmlui/qml/fixturesfunctions/2DView.qml +++ b/qmlui/qml/fixturesfunctions/2DView.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { @@ -222,7 +221,7 @@ Rectangle property int initialXPos property int initialYPos - onPressed: function (mouse) { + onPressed: (mouse) => { console.log("button: " + mouse.button + ", mods: " + mouse.modifiers) var itemID = View2D.itemIDAtPos(Qt.point(mouse.x, mouse.y)) @@ -255,7 +254,7 @@ Rectangle } } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (selectionRect.visible == true) { if (mouse.x !== initialXPos || mouse.y !== initialYPos) @@ -292,7 +291,7 @@ Rectangle } } - onReleased: function (mouse) { + onReleased: (mouse) => { if (selectionRect.visible === true && selectionRect.width && selectionRect.height) { var rx = selectionRect.x @@ -314,7 +313,7 @@ Rectangle } } - onWheel: function (wheel) { + onWheel: (wheel) => { //console.log("Wheel delta: " + wheel.angleDelta.y) if (wheel.angleDelta.y > 0) setZoom(0.5) @@ -349,7 +348,7 @@ Rectangle drag.threshold: 10 drag.target: parent - onReleased: function (mouse) { + onReleased: (mouse) => { if (drag.active) { var units = View2D.gridUnits === MonitorProperties.Meters ? 1000.0 : 304.8 diff --git a/qmlui/qml/fixturesfunctions/3DView/+qt5/SettingsView3D.qml b/qmlui/qml/fixturesfunctions/3DView/+qt5/SettingsView3D.qml index a446d6bffb..f82b3714c5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/+qt5/SettingsView3D.qml +++ b/qmlui/qml/fixturesfunctions/3DView/+qt5/SettingsView3D.qml @@ -17,10 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs 1.3 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/fixturesfunctions/3DView/3DView.qml b/qmlui/qml/fixturesfunctions/3DView/3DView.qml index 5ac220674b..208a3b5576 100644 --- a/qmlui/qml/fixturesfunctions/3DView/3DView.qml +++ b/qmlui/qml/fixturesfunctions/3DView/3DView.qml @@ -25,8 +25,6 @@ import Qt3D.Render 2.15 import Qt3D.Input 2.15 import Qt3D.Extras 2.15 -import "." - Rectangle { anchors.fill: parent @@ -372,14 +370,14 @@ Rectangle property int selGenericCount: View3D.genericSelectedCount sourceDevice: mDevice - onPressed: function (mouse) { + onPressed: (mouse) => { directionCounter = 0 dx = 0 dy = 0 startPoint = Qt.point(mouse.x, mouse.y) } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (directionCounter < 3) { dx += (Math.abs(mouse.x - startPoint.x)) @@ -466,7 +464,7 @@ Rectangle startPoint = Qt.point(mouse.x, mouse.y) } - onWheel: function (wheel) { + onWheel: (wheel) => { if (wheel.angleDelta.y > 0) viewCamera.setZoom(-1) else diff --git a/qmlui/qml/fixturesfunctions/3DView/3DViewUnsupported.qml b/qmlui/qml/fixturesfunctions/3DView/3DViewUnsupported.qml index db013b7db3..c8976e5c3d 100644 --- a/qmlui/qml/fixturesfunctions/3DView/3DViewUnsupported.qml +++ b/qmlui/qml/fixturesfunctions/3DView/3DViewUnsupported.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.8 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/fixturesfunctions/3DView/BlitEffect.qml b/qmlui/qml/fixturesfunctions/3DView/BlitEffect.qml index 8ef0957119..d9e25a8859 100644 --- a/qmlui/qml/fixturesfunctions/3DView/BlitEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/BlitEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/BlitFilter.qml b/qmlui/qml/fixturesfunctions/3DView/BlitFilter.qml index e2dae34ef7..0f9ce928b4 100644 --- a/qmlui/qml/fixturesfunctions/3DView/BlitFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/BlitFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/DeferredRenderer.qml b/qmlui/qml/fixturesfunctions/3DView/DeferredRenderer.qml index 837cc27655..6ad2701a58 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DeferredRenderer.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DeferredRenderer.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 RenderSettings { diff --git a/qmlui/qml/fixturesfunctions/3DView/DepthTarget.qml b/qmlui/qml/fixturesfunctions/3DView/DepthTarget.qml index 585578a1e8..c2a8dc5230 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DepthTarget.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DepthTarget.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 RenderTarget { diff --git a/qmlui/qml/fixturesfunctions/3DView/DirectionalLightFilter.qml b/qmlui/qml/fixturesfunctions/3DView/DirectionalLightFilter.qml index d6670723d7..8580297027 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DirectionalLightFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DirectionalLightFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/DownsampleEffect.qml b/qmlui/qml/fixturesfunctions/3DView/DownsampleEffect.qml index 769674d88f..2ee13bdf5a 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DownsampleEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DownsampleEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml b/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml index bb6861ef99..98449c931e 100644 --- a/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/DownsampleFilter.qml @@ -17,9 +17,9 @@ limitations under the License. */ +import QtQuick 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 -import QtQuick 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/FXAAEffect.qml b/qmlui/qml/fixturesfunctions/3DView/FXAAEffect.qml index e57aa3091d..4174fa54d2 100644 --- a/qmlui/qml/fixturesfunctions/3DView/FXAAEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/FXAAEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/FXAAFilter.qml b/qmlui/qml/fixturesfunctions/3DView/FXAAFilter.qml index c02223a49b..8c8b0ddaa0 100644 --- a/qmlui/qml/fixturesfunctions/3DView/FXAAFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/FXAAFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/FillGBufferFilter.qml b/qmlui/qml/fixturesfunctions/3DView/FillGBufferFilter.qml index 051d1cbfca..2ad1489b02 100644 --- a/qmlui/qml/fixturesfunctions/3DView/FillGBufferFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/FillGBufferFilter.qml @@ -18,10 +18,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 LayerFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml index 728309af01..98dfcace22 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Fixture3DItem.qml @@ -322,7 +322,7 @@ Entity { id: eSceneLoader - onStatusChanged: function (status) { + onStatusChanged: (status) => { if (status === SceneLoader.Ready) View3D.initializeFixture(itemID, fixtureEntity, eSceneLoader) } @@ -339,7 +339,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/FrameTarget.qml b/qmlui/qml/fixturesfunctions/3DView/FrameTarget.qml index 5ecc741c02..32c48ae930 100644 --- a/qmlui/qml/fixturesfunctions/3DView/FrameTarget.qml +++ b/qmlui/qml/fixturesfunctions/3DView/FrameTarget.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 RenderTarget { diff --git a/qmlui/qml/fixturesfunctions/3DView/GBuffer.qml b/qmlui/qml/fixturesfunctions/3DView/GBuffer.qml index d60f03cd68..7bbf6a4a67 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GBuffer.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GBuffer.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 RenderTarget { diff --git a/qmlui/qml/fixturesfunctions/3DView/GammaCorrectEffect.qml b/qmlui/qml/fixturesfunctions/3DView/GammaCorrectEffect.qml index 8304b54132..313e4ea88f 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GammaCorrectEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GammaCorrectEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/GammaCorrectFilter.qml b/qmlui/qml/fixturesfunctions/3DView/GammaCorrectFilter.qml index b93de912e7..4e9e20f15d 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GammaCorrectFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GammaCorrectFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml index fce3f8d4c1..2e1494093a 100644 --- a/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/Generic3DItem.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 import org.qlcplus.classes 1.0 -import "." Entity { @@ -41,7 +40,7 @@ Entity { id: eSceneLoader - onStatusChanged: function (status) { + onStatusChanged: (status) => { if (status === SceneLoader.Ready) View3D.initializeItem(itemID, genericEntity, eSceneLoader) } @@ -54,7 +53,7 @@ Entity id: eObjectPicker dragEnabled: true - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected View3D.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml b/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml index b4e285c5af..6f91a8398a 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GenericScreenQuadEntity.qml @@ -17,11 +17,11 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/GeometryPassEffect.qml b/qmlui/qml/fixturesfunctions/3DView/GeometryPassEffect.qml index 65457fa0bc..57b07473e5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GeometryPassEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GeometryPassEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/GrabBrightEffect.qml b/qmlui/qml/fixturesfunctions/3DView/GrabBrightEffect.qml index a18d2c3cb5..12fed86786 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GrabBrightEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GrabBrightEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/GrabBrightFilter.qml b/qmlui/qml/fixturesfunctions/3DView/GrabBrightFilter.qml index 80a1f63f96..7ac95d46d5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/GrabBrightFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/GrabBrightFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/LightEntity.qml b/qmlui/qml/fixturesfunctions/3DView/LightEntity.qml index 14fef26e52..b68f3d7d31 100644 --- a/qmlui/qml/fixturesfunctions/3DView/LightEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/LightEntity.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 import "Math3DView.js" as Math3D -import "." Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/LightPassEffect.qml b/qmlui/qml/fixturesfunctions/3DView/LightPassEffect.qml index cb6788c0c7..29e7358688 100644 --- a/qmlui/qml/fixturesfunctions/3DView/LightPassEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/LightPassEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml index caedb82571..8ce31c9192 100644 --- a/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/MultiBeams3DItem.qml @@ -18,15 +18,14 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 import org.qlcplus.classes 1.0 import "Math3DView.js" as Math3D -import "." Entity { @@ -274,7 +273,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthEffect.qml b/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthEffect.qml index 3b1615d5ba..85adc726fe 100644 --- a/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthFilter.qml b/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthFilter.qml index 0cfff1aa48..993f437ba5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/OutputFrontDepthFilter.qml @@ -18,10 +18,9 @@ */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 // Lights pass technique TechniqueFilter diff --git a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml index db1d9114d7..1ee71131c2 100644 --- a/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml +++ b/qmlui/qml/fixturesfunctions/3DView/PixelBar3DItem.qml @@ -18,15 +18,14 @@ limitations under the License. */ -import QtQuick 2.7 as QQ2 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 import org.qlcplus.classes 1.0 import "Math3DView.js" as Math3D -import "." Entity { @@ -101,7 +100,7 @@ Entity id: headsRepeater //model: fixtureEntity.headsNumber - onObjectAdded: function (index, object) { + onObjectAdded: (index, object) => { console.log("Head " + index + " added ----------------") if (index == fixtureEntity.headsNumber - 1) View3D.initializeFixture(itemID, fixtureEntity, null) @@ -166,7 +165,7 @@ Entity property var lastPos - onClicked: function (pick) { + onClicked: (pick) => { console.log("3D item clicked") isSelected = !isSelected contextManager.setItemSelection(itemID, isSelected, pick.modifiers) diff --git a/qmlui/qml/fixturesfunctions/3DView/RenderSelectionBoxesFilter.qml b/qmlui/qml/fixturesfunctions/3DView/RenderSelectionBoxesFilter.qml index 71657f1297..ec171fe4b3 100644 --- a/qmlui/qml/fixturesfunctions/3DView/RenderSelectionBoxesFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/RenderSelectionBoxesFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 LayerFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/RenderShadowMapFilter.qml b/qmlui/qml/fixturesfunctions/3DView/RenderShadowMapFilter.qml index 69690ab3c7..b5a15f5226 100644 --- a/qmlui/qml/fixturesfunctions/3DView/RenderShadowMapFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/RenderShadowMapFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 LayerFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml index 29791bb3ce..c8b64d57fb 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SceneEntity.qml @@ -17,12 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml index bd17df9958..bb8a5a61c9 100644 --- a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadEntity.qml @@ -17,11 +17,11 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml index f98dd955fb..b49c00c37d 100644 --- a/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/ScreenQuadGammaCorrectEntity.qml @@ -17,11 +17,11 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Extras 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml index e145cfdd81..39edb34c87 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SelectionEntity.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml b/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml index 5a6306d7cf..487331f9b6 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SettingsView3D.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml index 3cfc9aefef..ca4bbf3984 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightConeEntity.qml @@ -17,12 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringEffect.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringEffect.qml index 7d570702e5..db16d0eae5 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringFilter.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringFilter.qml index 2116d76fa4..95ab6f028d 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightScatteringFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 // Lights pass technique TechniqueFilter diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingEffect.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingEffect.qml index 96c00a4989..04fc7aa9e1 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingFilter.qml b/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingFilter.qml index a2f27b8de1..035b5d1d66 100644 --- a/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/SpotlightShadingFilter.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 - -import QtQuick 2.0 +import QtQuick 2.15 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml index 93538bcada..378b9d3b35 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageBox.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageBox.qml @@ -17,10 +17,10 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { @@ -76,7 +76,7 @@ Entity ObjectPicker { id: groundPicker - onClicked: function(pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -100,7 +100,7 @@ Entity ObjectPicker { id: leftPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -123,7 +123,7 @@ Entity ObjectPicker { id: rightPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } @@ -146,7 +146,7 @@ Entity ObjectPicker { id: backPicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml index 14c1ca8bcd..d0ca5614d2 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageRock.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageRock.qml @@ -17,12 +17,12 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { @@ -203,7 +203,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml index 155baa8f71..b740006975 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageSimple.qml @@ -17,10 +17,10 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { @@ -56,7 +56,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml index 3b35bdd6ac..b20943bf94 100644 --- a/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml +++ b/qmlui/qml/fixturesfunctions/3DView/StageTheatre.qml @@ -17,12 +17,12 @@ limitations under the License. */ -import QtQuick 2.7 +import QtQuick 2.15 -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 -import Qt3D.Input 2.0 -import Qt3D.Extras 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 +import Qt3D.Input 2.15 +import Qt3D.Extras 2.15 Entity { @@ -167,7 +167,7 @@ Entity ObjectPicker { id: stagePicker - onClicked: function (pick) { + onClicked: (pick) => { contextManager.setPositionPickPoint(pick.worldIntersection) } } diff --git a/qmlui/qml/fixturesfunctions/3DView/UpsampleEffect.qml b/qmlui/qml/fixturesfunctions/3DView/UpsampleEffect.qml index e6c8cd3bc2..381930f844 100644 --- a/qmlui/qml/fixturesfunctions/3DView/UpsampleEffect.qml +++ b/qmlui/qml/fixturesfunctions/3DView/UpsampleEffect.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Core 2.15 +import Qt3D.Render 2.15 Effect { diff --git a/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml b/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml index 1815afb672..18ca1b8aa0 100644 --- a/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml +++ b/qmlui/qml/fixturesfunctions/3DView/UpsampleFilter.qml @@ -17,9 +17,9 @@ limitations under the License. */ +import QtQuick 2.15 import Qt3D.Core 2.15 import Qt3D.Render 2.15 -import QtQuick 2.15 TechniqueFilter { diff --git a/qmlui/qml/fixturesfunctions/AddFunctionMenu.qml b/qmlui/qml/fixturesfunctions/AddFunctionMenu.qml index 494392ae99..bd236f0aa5 100644 --- a/qmlui/qml/fixturesfunctions/AddFunctionMenu.qml +++ b/qmlui/qml/fixturesfunctions/AddFunctionMenu.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Popup { diff --git a/qmlui/qml/fixturesfunctions/AudioEditor.qml b/qmlui/qml/fixturesfunctions/AudioEditor.qml index b1457f3255..f9e16ee7ab 100644 --- a/qmlui/qml/fixturesfunctions/AudioEditor.qml +++ b/qmlui/qml/fixturesfunctions/AudioEditor.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/BeamTool.qml b/qmlui/qml/fixturesfunctions/BeamTool.qml index 086556ed7f..414a5702c6 100644 --- a/qmlui/qml/fixturesfunctions/BeamTool.qml +++ b/qmlui/qml/fixturesfunctions/BeamTool.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/BottomPanel.qml b/qmlui/qml/fixturesfunctions/BottomPanel.qml index 738eada858..7838aa4184 100644 --- a/qmlui/qml/fixturesfunctions/BottomPanel.qml +++ b/qmlui/qml/fixturesfunctions/BottomPanel.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/fixturesfunctions/ChaserEditor.qml b/qmlui/qml/fixturesfunctions/ChaserEditor.qml index 11e0fa3312..981bbfb5f7 100644 --- a/qmlui/qml/fixturesfunctions/ChaserEditor.qml +++ b/qmlui/qml/fixturesfunctions/ChaserEditor.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/CollectionEditor.qml b/qmlui/qml/fixturesfunctions/CollectionEditor.qml index c5563fdf0a..0e9879d942 100644 --- a/qmlui/qml/fixturesfunctions/CollectionEditor.qml +++ b/qmlui/qml/fixturesfunctions/CollectionEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/CollectionFunctionDelegate.qml b/qmlui/qml/fixturesfunctions/CollectionFunctionDelegate.qml index 1752136350..bc02f80000 100644 --- a/qmlui/qml/fixturesfunctions/CollectionFunctionDelegate.qml +++ b/qmlui/qml/fixturesfunctions/CollectionFunctionDelegate.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/DMXView.qml b/qmlui/qml/fixturesfunctions/DMXView.qml index a4df0b86ab..35714e4172 100644 --- a/qmlui/qml/fixturesfunctions/DMXView.qml +++ b/qmlui/qml/fixturesfunctions/DMXView.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/EFXEditor.qml b/qmlui/qml/fixturesfunctions/EFXEditor.qml index 47a5561bc6..97cfa8a46e 100644 --- a/qmlui/qml/fixturesfunctions/EFXEditor.qml +++ b/qmlui/qml/fixturesfunctions/EFXEditor.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/EFXPreview.qml b/qmlui/qml/fixturesfunctions/EFXPreview.qml index aa9edbe6eb..22aaaa8ff1 100644 --- a/qmlui/qml/fixturesfunctions/EFXPreview.qml +++ b/qmlui/qml/fixturesfunctions/EFXPreview.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import "CanvasDrawFunctions.js" as DrawFuncs -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/EditorTopBar.qml b/qmlui/qml/fixturesfunctions/EditorTopBar.qml index 6c31141fa3..8201131cb6 100644 --- a/qmlui/qml/fixturesfunctions/EditorTopBar.qml +++ b/qmlui/qml/fixturesfunctions/EditorTopBar.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." RowLayout { diff --git a/qmlui/qml/fixturesfunctions/Fixture2DItem.qml b/qmlui/qml/fixturesfunctions/Fixture2DItem.qml index ed5f7192a8..2ebc11d458 100644 --- a/qmlui/qml/fixturesfunctions/Fixture2DItem.qml +++ b/qmlui/qml/fixturesfunctions/Fixture2DItem.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.10 +import QtQuick 2.15 import org.qlcplus.classes 1.0 import "CanvasDrawFunctions.js" as DrawFuncs -import "." Rectangle { @@ -301,7 +300,7 @@ Rectangle onEntered: fixtureLabel.visible = true onExited: showLabel ? fixtureLabel.visible = true : fixtureLabel.visible = false - onPressed: function (mouse) { + onPressed: (mouse) => { // do not accept this event to propagate it to the drag rectangle mouse.accepted = false } diff --git a/qmlui/qml/fixturesfunctions/FixtureBrowser.qml b/qmlui/qml/fixturesfunctions/FixtureBrowser.qml index 8a4a38f369..c4a8c84949 100644 --- a/qmlui/qml/fixturesfunctions/FixtureBrowser.qml +++ b/qmlui/qml/fixturesfunctions/FixtureBrowser.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { @@ -132,7 +131,7 @@ Rectangle width: modelsList.width - (manufScroll.visible ? manufScroll.width : 0) isManufacturer: true textLabel: modelData - onMouseEvent: function (type, iID, iType, qItem, mouseMods) { + onMouseEvent: (type, iID, iType, qItem, mouseMods) => { if (type == App.Clicked) { mfText.label = modelData @@ -238,7 +237,7 @@ Rectangle manufacturer: fixtureBrowser.selectedManufacturer textLabel: modelData - onMouseEvent: function (type, iID, iType, qItem, mouseMods) { + onMouseEvent: (type, iID, iType, qItem, mouseMods) => { if (type == App.Clicked) { modelsList.currentIndex = index diff --git a/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml index 8142b8b9ce..363f3b8978 100644 --- a/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureBrowserDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 import "FixtureDrag.js" as FxDragJS -import "." Item { @@ -111,13 +110,13 @@ Item id: fxMouseArea anchors.fill: parent hoverEnabled: true - onClicked: function (mouse) { + onClicked: (mouse) => { fxDraggableItem.mouseEvent(App.Clicked, 0, 0, fxDraggableItem, mouse.modifiers) } drag.target: FixtureDragItem { } drag.threshold: 30 - onPressed: function (mouse) { + onPressed: (mouse) => { if (fxDraggableItem.isManufacturer == false) { fxDraggableItem.mouseEvent(App.Clicked, 0, 0, fxDraggableItem, mouse.modifiers) @@ -125,11 +124,11 @@ Item FxDragJS.initProperties() } } - onPositionChanged: function (mouse) { + onPositionChanged: (mouse) => { if (fxDraggableItem.isManufacturer == false && drag.active == true) FxDragJS.handleDrag(mouse) } - onReleased: function (mouse) { + onReleased: (mouse) => { if (fxDraggableItem.isManufacturer == false && drag.active == true) FxDragJS.endDrag(mouse) } diff --git a/qmlui/qml/fixturesfunctions/FixtureChannelDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureChannelDelegate.qml index 1f11d4f784..022cb052d9 100644 --- a/qmlui/qml/fixturesfunctions/FixtureChannelDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureChannelDelegate.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureDMXItem.qml b/qmlui/qml/fixturesfunctions/FixtureDMXItem.qml index 6cf0339c43..214f1090db 100644 --- a/qmlui/qml/fixturesfunctions/FixtureDMXItem.qml +++ b/qmlui/qml/fixturesfunctions/FixtureDMXItem.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.2 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureDragItem.qml b/qmlui/qml/fixturesfunctions/FixtureDragItem.qml index e0c4ae11d7..919ba4d32b 100644 --- a/qmlui/qml/fixturesfunctions/FixtureDragItem.qml +++ b/qmlui/qml/fixturesfunctions/FixtureDragItem.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Item { diff --git a/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml b/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml index a2dd77cf8d..5334c5d931 100644 --- a/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml +++ b/qmlui/qml/fixturesfunctions/FixtureGroupEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureGroupManager.qml b/qmlui/qml/fixturesfunctions/FixtureGroupManager.qml index dc827b164d..87f3b79ae1 100644 --- a/qmlui/qml/fixturesfunctions/FixtureGroupManager.qml +++ b/qmlui/qml/fixturesfunctions/FixtureGroupManager.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureHeadDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureHeadDelegate.qml index b8f6f4719d..35769ba8d9 100644 --- a/qmlui/qml/fixturesfunctions/FixtureHeadDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureHeadDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml index 9a44a25cd9..4acca36cda 100644 --- a/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml +++ b/qmlui/qml/fixturesfunctions/FixtureNodeDelegate.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.2 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Column { diff --git a/qmlui/qml/fixturesfunctions/FixtureProperties.qml b/qmlui/qml/fixturesfunctions/FixtureProperties.qml index 8633e93f17..19ec5a83ca 100644 --- a/qmlui/qml/fixturesfunctions/FixtureProperties.qml +++ b/qmlui/qml/fixturesfunctions/FixtureProperties.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixtureSummary.qml b/qmlui/qml/fixturesfunctions/FixtureSummary.qml index d36e644f47..667746d6db 100644 --- a/qmlui/qml/fixturesfunctions/FixtureSummary.qml +++ b/qmlui/qml/fixturesfunctions/FixtureSummary.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml b/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml index a1dc61e8be..29b56aba58 100644 --- a/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml +++ b/qmlui/qml/fixturesfunctions/FixturesAndFunctions.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/FunctionManager.qml b/qmlui/qml/fixturesfunctions/FunctionManager.qml index bb703b19f5..ae46c0e7d0 100644 --- a/qmlui/qml/fixturesfunctions/FunctionManager.qml +++ b/qmlui/qml/fixturesfunctions/FunctionManager.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/GridEditor.qml b/qmlui/qml/fixturesfunctions/GridEditor.qml index c8e2eac887..c6fd74b6f0 100644 --- a/qmlui/qml/fixturesfunctions/GridEditor.qml +++ b/qmlui/qml/fixturesfunctions/GridEditor.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/IntensityTool.qml b/qmlui/qml/fixturesfunctions/IntensityTool.qml index 61ebe7ca3f..597923c625 100644 --- a/qmlui/qml/fixturesfunctions/IntensityTool.qml +++ b/qmlui/qml/fixturesfunctions/IntensityTool.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml index 1c25b86880..9bfde6dab8 100644 --- a/qmlui/qml/fixturesfunctions/LeftPanel.qml +++ b/qmlui/qml/fixturesfunctions/LeftPanel.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." SidePanel { @@ -31,7 +30,7 @@ SidePanel anchors.leftMargin: 0 panelAlignment: Qt.AlignLeft - onContentLoaded: function (item, ID) { + onContentLoaded: (item, ID) => { item.width = Qt.binding(function() { return leftSidePanel.width - collapseWidth }) item.height = Qt.binding(function() { return leftSidePanel.height }) } diff --git a/qmlui/qml/fixturesfunctions/PaletteManager.qml b/qmlui/qml/fixturesfunctions/PaletteManager.qml index 9df70337e7..090236bb24 100644 --- a/qmlui/qml/fixturesfunctions/PaletteManager.qml +++ b/qmlui/qml/fixturesfunctions/PaletteManager.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/PositionTool.qml b/qmlui/qml/fixturesfunctions/PositionTool.qml index e0369e8250..a64300ebc8 100644 --- a/qmlui/qml/fixturesfunctions/PositionTool.qml +++ b/qmlui/qml/fixturesfunctions/PositionTool.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "CanvasDrawFunctions.js" as DrawFuncs -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml b/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml index a1a0a5d3af..5a7301ef45 100644 --- a/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml +++ b/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/PresetsTool.qml b/qmlui/qml/fixturesfunctions/PresetsTool.qml index 17d07bd963..d1501b306e 100644 --- a/qmlui/qml/fixturesfunctions/PresetsTool.qml +++ b/qmlui/qml/fixturesfunctions/PresetsTool.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.3 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml b/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml index 1ca13fab8e..279bbdb185 100644 --- a/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml +++ b/qmlui/qml/fixturesfunctions/RGBMatrixEditor.qml @@ -17,15 +17,14 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/RGBMatrixPreview.qml b/qmlui/qml/fixturesfunctions/RGBMatrixPreview.qml index 375591ddd6..aa184da6ea 100644 --- a/qmlui/qml/fixturesfunctions/RGBMatrixPreview.qml +++ b/qmlui/qml/fixturesfunctions/RGBMatrixPreview.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml b/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml index c6251b69a9..bb7f113126 100644 --- a/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml +++ b/qmlui/qml/fixturesfunctions/RGBPanelProperties.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.3 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/RightPanel.qml b/qmlui/qml/fixturesfunctions/RightPanel.qml index 574658e530..06f060ec99 100644 --- a/qmlui/qml/fixturesfunctions/RightPanel.qml +++ b/qmlui/qml/fixturesfunctions/RightPanel.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs import org.qlcplus.classes 1.0 -import "." SidePanel { @@ -103,7 +102,7 @@ SidePanel animatePanel(true) } - onContentLoaded: function(item, ID) { + onContentLoaded: (item, ID) => { if (item.hasOwnProperty("functionID")) item.functionID = itemID } diff --git a/qmlui/qml/fixturesfunctions/SceneEditor.qml b/qmlui/qml/fixturesfunctions/SceneEditor.qml index 162c277f6f..39753fa7c4 100644 --- a/qmlui/qml/fixturesfunctions/SceneEditor.qml +++ b/qmlui/qml/fixturesfunctions/SceneEditor.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { @@ -119,7 +118,7 @@ Rectangle id: toolbar visible: !boundToSequence text: sceneEditor ? sceneEditor.functionName : "" - onTextChanged: function(text) { + onTextChanged: (text) => { sceneEditor.functionName = text } diff --git a/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml b/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml index fea80e72e5..4241695310 100644 --- a/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml +++ b/qmlui/qml/fixturesfunctions/SceneFixtureConsole.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/ScriptEditor.qml b/qmlui/qml/fixturesfunctions/ScriptEditor.qml index ed1fa73e97..42af1b3618 100644 --- a/qmlui/qml/fixturesfunctions/ScriptEditor.qml +++ b/qmlui/qml/fixturesfunctions/ScriptEditor.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/SequenceEditor.qml b/qmlui/qml/fixturesfunctions/SequenceEditor.qml index 43af9969f0..b05312233d 100644 --- a/qmlui/qml/fixturesfunctions/SequenceEditor.qml +++ b/qmlui/qml/fixturesfunctions/SequenceEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/SettingsView2D.qml b/qmlui/qml/fixturesfunctions/SettingsView2D.qml index 3a215bf92c..2448f88268 100644 --- a/qmlui/qml/fixturesfunctions/SettingsView2D.qml +++ b/qmlui/qml/fixturesfunctions/SettingsView2D.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/SettingsViewDMX.qml b/qmlui/qml/fixturesfunctions/SettingsViewDMX.qml index 150aa5e5ab..2e795528f9 100644 --- a/qmlui/qml/fixturesfunctions/SettingsViewDMX.qml +++ b/qmlui/qml/fixturesfunctions/SettingsViewDMX.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/ShutterAnimator.qml b/qmlui/qml/fixturesfunctions/ShutterAnimator.qml index 17399ac3a5..3e82d6723d 100644 --- a/qmlui/qml/fixturesfunctions/ShutterAnimator.qml +++ b/qmlui/qml/fixturesfunctions/ShutterAnimator.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.2 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Item { diff --git a/qmlui/qml/fixturesfunctions/UniverseGridView.qml b/qmlui/qml/fixturesfunctions/UniverseGridView.qml index 0c321caa39..ae17a9929c 100644 --- a/qmlui/qml/fixturesfunctions/UniverseGridView.qml +++ b/qmlui/qml/fixturesfunctions/UniverseGridView.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import QtQuick.Dialogs -import QtQuick.Layouts 1.14 +import QtQuick.Layouts 1.15 -import "." Flickable { diff --git a/qmlui/qml/fixturesfunctions/UniverseSummary.qml b/qmlui/qml/fixturesfunctions/UniverseSummary.qml index 6c80a58521..58cfc5ed69 100644 --- a/qmlui/qml/fixturesfunctions/UniverseSummary.qml +++ b/qmlui/qml/fixturesfunctions/UniverseSummary.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/VideoContext.qml b/qmlui/qml/fixturesfunctions/VideoContext.qml index 9e045d344e..93ec66ff38 100644 --- a/qmlui/qml/fixturesfunctions/VideoContext.qml +++ b/qmlui/qml/fixturesfunctions/VideoContext.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import QtMultimedia 5.8 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/fixturesfunctions/VideoEditor.qml b/qmlui/qml/fixturesfunctions/VideoEditor.qml index 3e73560c2a..4884b55870 100644 --- a/qmlui/qml/fixturesfunctions/VideoEditor.qml +++ b/qmlui/qml/fixturesfunctions/VideoEditor.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/AudioCardsList.qml b/qmlui/qml/inputoutput/AudioCardsList.qml index e7deb8eab8..429fd8b9b6 100644 --- a/qmlui/qml/inputoutput/AudioCardsList.qml +++ b/qmlui/qml/inputoutput/AudioCardsList.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/inputoutput/AudioDeviceItem.qml b/qmlui/qml/inputoutput/AudioDeviceItem.qml index 61a039f8df..3830f60e15 100644 --- a/qmlui/qml/inputoutput/AudioDeviceItem.qml +++ b/qmlui/qml/inputoutput/AudioDeviceItem.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/inputoutput/AudioIOItem.qml b/qmlui/qml/inputoutput/AudioIOItem.qml index aac35a9435..5c823ed101 100644 --- a/qmlui/qml/inputoutput/AudioIOItem.qml +++ b/qmlui/qml/inputoutput/AudioIOItem.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/inputoutput/IOLeftPanel.qml b/qmlui/qml/inputoutput/IOLeftPanel.qml index 26ec6e62aa..0b2fcc11cf 100644 --- a/qmlui/qml/inputoutput/IOLeftPanel.qml +++ b/qmlui/qml/inputoutput/IOLeftPanel.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." SidePanel { diff --git a/qmlui/qml/inputoutput/IORightPanel.qml b/qmlui/qml/inputoutput/IORightPanel.qml index 79108cba14..284b966610 100644 --- a/qmlui/qml/inputoutput/IORightPanel.qml +++ b/qmlui/qml/inputoutput/IORightPanel.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 -import "." SidePanel { diff --git a/qmlui/qml/inputoutput/InputOutputManager.qml b/qmlui/qml/inputoutput/InputOutputManager.qml index 805be51cf5..cfca0f1845 100644 --- a/qmlui/qml/inputoutput/InputOutputManager.qml +++ b/qmlui/qml/inputoutput/InputOutputManager.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/InputPatchItem.qml b/qmlui/qml/inputoutput/InputPatchItem.qml index e1aa1c5325..9db4b8c893 100644 --- a/qmlui/qml/inputoutput/InputPatchItem.qml +++ b/qmlui/qml/inputoutput/InputPatchItem.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/InputProfileEditor.qml b/qmlui/qml/inputoutput/InputProfileEditor.qml index 4c4d463baf..40f7437a25 100644 --- a/qmlui/qml/inputoutput/InputProfileEditor.qml +++ b/qmlui/qml/inputoutput/InputProfileEditor.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import QtQml.Models 2.13 import org.qlcplus.classes 1.0 -import "." ColumnLayout { diff --git a/qmlui/qml/inputoutput/OutputPatchItem.qml b/qmlui/qml/inputoutput/OutputPatchItem.qml index e47cce18d8..e930c96eb4 100644 --- a/qmlui/qml/inputoutput/OutputPatchItem.qml +++ b/qmlui/qml/inputoutput/OutputPatchItem.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/PatchWireBox.qml b/qmlui/qml/inputoutput/PatchWireBox.qml index 5d3e7259d8..9290af97d9 100644 --- a/qmlui/qml/inputoutput/PatchWireBox.qml +++ b/qmlui/qml/inputoutput/PatchWireBox.qml @@ -17,9 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 -import "." Canvas { diff --git a/qmlui/qml/inputoutput/PluginDragItem.qml b/qmlui/qml/inputoutput/PluginDragItem.qml index bacd0b817f..d08f89509c 100644 --- a/qmlui/qml/inputoutput/PluginDragItem.qml +++ b/qmlui/qml/inputoutput/PluginDragItem.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import "GenericHelpers.js" as Helpers -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/PluginsList.qml b/qmlui/qml/inputoutput/PluginsList.qml index 42e34de37e..8301a6479d 100644 --- a/qmlui/qml/inputoutput/PluginsList.qml +++ b/qmlui/qml/inputoutput/PluginsList.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/inputoutput/ProfilesList.qml b/qmlui/qml/inputoutput/ProfilesList.qml index 54cc3b5bad..c3fe9b0afb 100644 --- a/qmlui/qml/inputoutput/ProfilesList.qml +++ b/qmlui/qml/inputoutput/ProfilesList.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/inputoutput/UniverseIOItem.qml b/qmlui/qml/inputoutput/UniverseIOItem.qml index 8a4816d87c..9e522e61b7 100644 --- a/qmlui/qml/inputoutput/UniverseIOItem.qml +++ b/qmlui/qml/inputoutput/UniverseIOItem.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/popup/CustomPopupDialog.qml b/qmlui/qml/popup/CustomPopupDialog.qml index 6f552cabf8..ce84b83fcd 100644 --- a/qmlui/qml/popup/CustomPopupDialog.qml +++ b/qmlui/qml/popup/CustomPopupDialog.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 -import "." Dialog { @@ -95,7 +94,7 @@ Dialog contentItem.implicitHeight: UISettings.iconSizeDefault - onClicked: function (button) { + onClicked: (button) => { if (button === standardButton(Dialog.Yes)) control.clicked(Dialog.Yes) else if (button === standardButton(Dialog.No)) diff --git a/qmlui/qml/popup/PopupAbout.qml b/qmlui/qml/popup/PopupAbout.qml index 41b4fa9deb..d7b2f25a85 100644 --- a/qmlui/qml/popup/PopupAbout.qml +++ b/qmlui/qml/popup/PopupAbout.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupChannelModifiers.qml b/qmlui/qml/popup/PopupChannelModifiers.qml index a14fe1451c..8cfdcfd80c 100644 --- a/qmlui/qml/popup/PopupChannelModifiers.qml +++ b/qmlui/qml/popup/PopupChannelModifiers.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupChannelWizard.qml b/qmlui/qml/popup/PopupChannelWizard.qml index 4f06c83066..52764505b5 100644 --- a/qmlui/qml/popup/PopupChannelWizard.qml +++ b/qmlui/qml/popup/PopupChannelWizard.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupCreatePalette.qml b/qmlui/qml/popup/PopupCreatePalette.qml index 3178dcf636..7b8a54ff4d 100644 --- a/qmlui/qml/popup/PopupCreatePalette.qml +++ b/qmlui/qml/popup/PopupCreatePalette.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupDMXDump.qml b/qmlui/qml/popup/PopupDMXDump.qml index 4fc8d376eb..1fcc85dcde 100644 --- a/qmlui/qml/popup/PopupDMXDump.qml +++ b/qmlui/qml/popup/PopupDMXDump.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupDisclaimer.qml b/qmlui/qml/popup/PopupDisclaimer.qml index 3e08f2df36..7afb13d3dd 100644 --- a/qmlui/qml/popup/PopupDisclaimer.qml +++ b/qmlui/qml/popup/PopupDisclaimer.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupFolderBrowser.qml b/qmlui/qml/popup/PopupFolderBrowser.qml index afa05433a6..316dd3866a 100644 --- a/qmlui/qml/popup/PopupFolderBrowser.qml +++ b/qmlui/qml/popup/PopupFolderBrowser.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupImportProject.qml b/qmlui/qml/popup/PopupImportProject.qml index acbbd4c67b..7a0ae2f093 100644 --- a/qmlui/qml/popup/PopupImportProject.qml +++ b/qmlui/qml/popup/PopupImportProject.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupInputChannelEditor.qml b/qmlui/qml/popup/PopupInputChannelEditor.qml index 165aedf72b..afc0464241 100644 --- a/qmlui/qml/popup/PopupInputChannelEditor.qml +++ b/qmlui/qml/popup/PopupInputChannelEditor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupManualInputSource.qml b/qmlui/qml/popup/PopupManualInputSource.qml index d0a81d9210..b9152f1286 100644 --- a/qmlui/qml/popup/PopupManualInputSource.qml +++ b/qmlui/qml/popup/PopupManualInputSource.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupMonitor.qml b/qmlui/qml/popup/PopupMonitor.qml index 0e251c58cd..123921a4b3 100644 --- a/qmlui/qml/popup/PopupMonitor.qml +++ b/qmlui/qml/popup/PopupMonitor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupNetworkClient.qml b/qmlui/qml/popup/PopupNetworkClient.qml index 7e22aac599..5afdf519c3 100644 --- a/qmlui/qml/popup/PopupNetworkClient.qml +++ b/qmlui/qml/popup/PopupNetworkClient.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.2 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupNetworkConnect.qml b/qmlui/qml/popup/PopupNetworkConnect.qml index 582fc8ee7b..d552b5e835 100644 --- a/qmlui/qml/popup/PopupNetworkConnect.qml +++ b/qmlui/qml/popup/PopupNetworkConnect.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupNetworkServer.qml b/qmlui/qml/popup/PopupNetworkServer.qml index 243cfa192a..37eab5cca3 100644 --- a/qmlui/qml/popup/PopupNetworkServer.qml +++ b/qmlui/qml/popup/PopupNetworkServer.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupPINRequest.qml b/qmlui/qml/popup/PopupPINRequest.qml index ab26b6e17c..ab3636fee8 100644 --- a/qmlui/qml/popup/PopupPINRequest.qml +++ b/qmlui/qml/popup/PopupPINRequest.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupPINSetup.qml b/qmlui/qml/popup/PopupPINSetup.qml index 866d366413..cd1d83dc34 100644 --- a/qmlui/qml/popup/PopupPINSetup.qml +++ b/qmlui/qml/popup/PopupPINSetup.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/popup/PopupRenameItems.qml b/qmlui/qml/popup/PopupRenameItems.qml index d7ea9c0076..1cec6440d6 100644 --- a/qmlui/qml/popup/PopupRenameItems.qml +++ b/qmlui/qml/popup/PopupRenameItems.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." CustomPopupDialog { diff --git a/qmlui/qml/showmanager/HeaderAndCursor.qml b/qmlui/qml/showmanager/HeaderAndCursor.qml index 1642a8b6d5..a83d9aaaac 100644 --- a/qmlui/qml/showmanager/HeaderAndCursor.qml +++ b/qmlui/qml/showmanager/HeaderAndCursor.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { @@ -212,7 +211,7 @@ Rectangle { enabled: showTimeMarkers anchors.fill: parent - onClicked: function (mouse) { + onClicked: (mouse) => { tlHeaderCursorLayer.clicked(mouse.x, mouse.y) } } diff --git a/qmlui/qml/showmanager/ShowItem.qml b/qmlui/qml/showmanager/ShowItem.qml index e94a004f6d..8506f5312e 100644 --- a/qmlui/qml/showmanager/ShowItem.qml +++ b/qmlui/qml/showmanager/ShowItem.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.13 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Item { diff --git a/qmlui/qml/showmanager/ShowManager.qml b/qmlui/qml/showmanager/ShowManager.qml index b8bedf9cd8..6c65cd8db4 100644 --- a/qmlui/qml/showmanager/ShowManager.qml +++ b/qmlui/qml/showmanager/ShowManager.qml @@ -17,14 +17,13 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { @@ -447,7 +446,7 @@ Rectangle headerHeight: showMgrContainer.headerHeight cursorHeight: showMgrContainer.height - topBar.height - (bottomPanel.visible ? bottomPanel.height : 0) duration: showManager.showDuration - onClicked: function (mouseX, mouseY) { + onClicked: (mouseX, mouseY) => { if (timeDivision === Show.Time) showManager.currentTime = TimeUtils.posToMs(mouseX, timeScale, tickSize) else @@ -541,7 +540,7 @@ Rectangle MouseArea { anchors.fill: parent - onClicked: function (mouse) { + onClicked: (mouse) => { showManager.currentTime = TimeUtils.posToMs(mouse.x, timeScale, tickSize) showManager.resetItemsSelection() } diff --git a/qmlui/qml/showmanager/TrackDelegate.qml b/qmlui/qml/showmanager/TrackDelegate.qml index be34b8ef39..1f5925f0a0 100644 --- a/qmlui/qml/showmanager/TrackDelegate.qml +++ b/qmlui/qml/showmanager/TrackDelegate.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCButtonItem.qml b/qmlui/qml/virtualconsole/VCButtonItem.qml index aa513ddda8..ade68849fd 100644 --- a/qmlui/qml/virtualconsole/VCButtonItem.qml +++ b/qmlui/qml/virtualconsole/VCButtonItem.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/virtualconsole/VCButtonProperties.qml b/qmlui/qml/virtualconsole/VCButtonProperties.qml index e94207d15c..34125e0efe 100644 --- a/qmlui/qml/virtualconsole/VCButtonProperties.qml +++ b/qmlui/qml/virtualconsole/VCButtonProperties.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCClockItem.qml b/qmlui/qml/virtualconsole/VCClockItem.qml index 3c96e335fc..8c1a183166 100644 --- a/qmlui/qml/virtualconsole/VCClockItem.qml +++ b/qmlui/qml/virtualconsole/VCClockItem.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 import "TimeUtils.js" as TimeUtils -import "." VCWidgetItem { diff --git a/qmlui/qml/virtualconsole/VCClockProperties.qml b/qmlui/qml/virtualconsole/VCClockProperties.qml index b21bd976fc..9b5ecd4456 100644 --- a/qmlui/qml/virtualconsole/VCClockProperties.qml +++ b/qmlui/qml/virtualconsole/VCClockProperties.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCCueListItem.qml b/qmlui/qml/virtualconsole/VCCueListItem.qml index f6179ace47..7e4cee2cd6 100644 --- a/qmlui/qml/virtualconsole/VCCueListItem.qml +++ b/qmlui/qml/virtualconsole/VCCueListItem.qml @@ -17,9 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.14 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/virtualconsole/VCCueListProperties.qml b/qmlui/qml/virtualconsole/VCCueListProperties.qml index cd8932a5ba..f62d30a00e 100644 --- a/qmlui/qml/virtualconsole/VCCueListProperties.qml +++ b/qmlui/qml/virtualconsole/VCCueListProperties.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCFrameItem.qml b/qmlui/qml/virtualconsole/VCFrameItem.qml index ccad3f9b85..283d90b95a 100644 --- a/qmlui/qml/virtualconsole/VCFrameItem.qml +++ b/qmlui/qml/virtualconsole/VCFrameItem.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." VCWidgetItem { diff --git a/qmlui/qml/virtualconsole/VCFrameProperties.qml b/qmlui/qml/virtualconsole/VCFrameProperties.qml index b7f23d3b8c..aedffbb1a9 100644 --- a/qmlui/qml/virtualconsole/VCFrameProperties.qml +++ b/qmlui/qml/virtualconsole/VCFrameProperties.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCLabelItem.qml b/qmlui/qml/virtualconsole/VCLabelItem.qml index 3347da8c52..1aa4d7259c 100644 --- a/qmlui/qml/virtualconsole/VCLabelItem.qml +++ b/qmlui/qml/virtualconsole/VCLabelItem.qml @@ -17,7 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 diff --git a/qmlui/qml/virtualconsole/VCPageArea.qml b/qmlui/qml/virtualconsole/VCPageArea.qml index aa13b51691..109e0adec4 100644 --- a/qmlui/qml/virtualconsole/VCPageArea.qml +++ b/qmlui/qml/virtualconsole/VCPageArea.qml @@ -17,8 +17,8 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 Rectangle { diff --git a/qmlui/qml/virtualconsole/VCPageProperties.qml b/qmlui/qml/virtualconsole/VCPageProperties.qml index 54e0b45474..956161179c 100644 --- a/qmlui/qml/virtualconsole/VCPageProperties.qml +++ b/qmlui/qml/virtualconsole/VCPageProperties.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCRightPanel.qml b/qmlui/qml/virtualconsole/VCRightPanel.qml index de25ca944d..52fcac7adf 100644 --- a/qmlui/qml/virtualconsole/VCRightPanel.qml +++ b/qmlui/qml/virtualconsole/VCRightPanel.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." SidePanel { diff --git a/qmlui/qml/virtualconsole/VCSliderItem.qml b/qmlui/qml/virtualconsole/VCSliderItem.qml index dcea323ffe..472902544b 100644 --- a/qmlui/qml/virtualconsole/VCSliderItem.qml +++ b/qmlui/qml/virtualconsole/VCSliderItem.qml @@ -17,11 +17,10 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import org.qlcplus.classes 1.0 -import "." VCWidgetItem { diff --git a/qmlui/qml/virtualconsole/VCSliderProperties.qml b/qmlui/qml/virtualconsole/VCSliderProperties.qml index 33e77ab8f7..31d35cfa72 100644 --- a/qmlui/qml/virtualconsole/VCSliderProperties.qml +++ b/qmlui/qml/virtualconsole/VCSliderProperties.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCWidgetItem.qml b/qmlui/qml/virtualconsole/VCWidgetItem.qml index f00f5eef6e..cfe9cbca25 100644 --- a/qmlui/qml/virtualconsole/VCWidgetItem.qml +++ b/qmlui/qml/virtualconsole/VCWidgetItem.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 +import QtQuick 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VCWidgetProperties.qml b/qmlui/qml/virtualconsole/VCWidgetProperties.qml index f82a8c2725..199bb8abcb 100644 --- a/qmlui/qml/virtualconsole/VCWidgetProperties.qml +++ b/qmlui/qml/virtualconsole/VCWidgetProperties.qml @@ -17,13 +17,12 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 import QtQuick.Dialogs -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/VirtualConsole.qml b/qmlui/qml/virtualconsole/VirtualConsole.qml index aba2fa50ae..9000ec8d22 100644 --- a/qmlui/qml/virtualconsole/VirtualConsole.qml +++ b/qmlui/qml/virtualconsole/VirtualConsole.qml @@ -17,12 +17,11 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 import org.qlcplus.classes 1.0 -import "." Rectangle { diff --git a/qmlui/qml/virtualconsole/WidgetDragItem.qml b/qmlui/qml/virtualconsole/WidgetDragItem.qml index b28aff7b5c..0a259a8339 100644 --- a/qmlui/qml/virtualconsole/WidgetDragItem.qml +++ b/qmlui/qml/virtualconsole/WidgetDragItem.qml @@ -17,8 +17,7 @@ limitations under the License. */ -import QtQuick 2.0 -import "." +import QtQuick 2.15 Rectangle { diff --git a/qmlui/qml/virtualconsole/WidgetsList.qml b/qmlui/qml/virtualconsole/WidgetsList.qml index 941ac4eefc..e9f7e6e3fc 100644 --- a/qmlui/qml/virtualconsole/WidgetsList.qml +++ b/qmlui/qml/virtualconsole/WidgetsList.qml @@ -17,10 +17,9 @@ limitations under the License. */ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import "." Rectangle { diff --git a/qmlui/uimanager.cpp b/qmlui/uimanager.cpp index b063b27c83..6c0da44892 100644 --- a/qmlui/uimanager.cpp +++ b/qmlui/uimanager.cpp @@ -47,7 +47,7 @@ void UiManager::initialize() * to change the UI settings at runtime */ QQmlComponent component(m_view->engine()); const char *source = - "import QtQuick 2.0\n" + "import QtQuick 2.15\n" "import \".\"\n" "QtObject {\n" " property var style: UISettings\n"