3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Update QtQuick and QtQuick.Controls

Browse source 
CURA-7813
This commit is contained in:
jelle Spijker 2021-03-29 17:55:19 +02:00 • committed by Jelle Spijker
parent a277adae64
commit 2986d50745
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
148 changed files with 308 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick 2.15
import QtQuick.Controls 2.15
import UM 1.3 as UM
import Cura 1.0 as Cura
@ -36,4 +36,4 @@ Item
outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
}
}
}

4
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick 2.15
import QtQuick.Controls 2.15
import UM 1.2 as UM
import Cura 1.0 as Cura

4
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 2.3
import QtQuick 2.15
import QtQuick.Controls 2.15
import UM 1.2 as UM
import Cura 1.0 as Cura

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3

6
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -1,9 +1,9 @@
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Controls 1.1 as OldControls
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 1.4 as OldControls
import Cura 1.0 as Cura
import UM 1.3 as UM

4
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick 2.15
import QtQuick.Controls 2.15
import UM 1.2 as UM
import Cura 1.0 as Cura

4
resources/qml/Menus/ContextMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2016 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Window 2.1

4
resources/qml/Menus/FileMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.6 as UM
import Cura 1.0 as Cura

2
resources/qml/Menus/LocalPrinterMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM

2
resources/qml/Menus/MaterialMenu.qml
View file

@ -1,7 +1,7 @@
//Copyright (c) 2020 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM

2
resources/qml/Menus/NetworkPrinterMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM

2
resources/qml/Menus/NozzleMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM

4
resources/qml/Menus/OpenFilesMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2020 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.6 as UM
import Cura 1.0 as Cura

2
resources/qml/Menus/PrinterMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.15
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4

2
resources/qml/Menus/PrinterTypeMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.3 as UM

4
resources/qml/Menus/RecentFilesMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.3 as UM
import Cura 1.0 as Cura

4
resources/qml/Menus/SaveProjectMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.6 as UM
import Cura 1.1 as Cura

2
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM

4
resources/qml/Menus/SettingsMenu.qml
View file

@ -1,7 +1,7 @@
//Copyright (c) 2020 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM
@ -68,4 +68,4 @@ Menu
MenuSeparator { }
MenuItem { action: Cura.Actions.configureSettingVisibility }
}
}

4
resources/qml/Menus/ViewMenu.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick 2.15
import QtQuick.Controls 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura