Browse Source

Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings

Cura 7813 qml modules version bump
Konstantinos Karmas 4 years ago
parent
commit
180732788b

+ 3 - 3
resources/qml/Account/AccountDetails.qml

@@ -1,8 +1,8 @@
 // Copyright (c) 2020 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 UM 1.4 as UM
 import Cura 1.1 as Cura
@@ -31,4 +31,4 @@ Item
         id: generalOperations
         GeneralOperations { }
     }
-}
+}

+ 2 - 2
resources/qml/Account/AccountWidget.qml

@@ -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 UM 1.4 as UM
 import Cura 1.1 as Cura

+ 3 - 3
resources/qml/Account/AvatarImage.qml

@@ -1,9 +1,9 @@
 // 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 QtGraphicalEffects 1.0
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.12
 
 import UM 1.4 as UM
 

+ 3 - 3
resources/qml/Account/GeneralOperations.qml

@@ -1,8 +1,8 @@
 // Copyright (c) 2019 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 UM 1.4 as UM
 import Cura 1.1 as Cura
@@ -79,4 +79,4 @@ Column
         onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
         fixedWidthMode: true
     }
-}
+}

+ 2 - 2
resources/qml/Account/SyncState.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 import UM 1.4 as UM
 import Cura 1.1 as Cura

+ 2 - 2
resources/qml/Account/UserOperations.qml

@@ -1,8 +1,8 @@
 // Copyright (c) 2020 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 UM 1.4 as UM
 import Cura 1.1 as Cura

+ 4 - 4
resources/qml/ActionButton.qml

@@ -1,9 +1,9 @@
 // Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-import QtGraphicalEffects 1.0 // For the dropshadow
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.12 // For the dropshadow
 
 import UM 1.1 as UM
 import Cura 1.0 as Cura
@@ -189,4 +189,4 @@ Button
             duration: 2500
         }
     }
-}
+}

+ 3 - 3
resources/qml/ActionPanel/ActionPanelWidget.qml

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

+ 4 - 4
resources/qml/ActionPanel/OutputDevicesActionButton.qml

@@ -1,9 +1,9 @@
 // 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.1
-import QtQuick.Layouts 1.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import UM 1.1 as UM
 import Cura 1.0 as Cura
@@ -113,4 +113,4 @@ Item
     }
 
     UM.OutputDevicesModel { id: devicesModel }
-}
+}

+ 4 - 4
resources/qml/ActionPanel/OutputProcessWidget.qml

@@ -1,9 +1,9 @@
 // Copyright (c) 2019 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import UM 1.1 as UM
 import Cura 1.0 as Cura
@@ -142,4 +142,4 @@ Column
             height: UM.Theme.getSize("action_button").height
         }
     }
-}
+}

Some files were not shown because too many files changed in this diff