Browse Source

Revert "Use QTQuick 2.2 to fix garbled fonts"

This reverts commit 0d5bb952efc468522b55cbf903349aaf7f979af9.
Mark 7 years ago
parent
commit
12b2348309

+ 1 - 1
resources/qml/Settings/SettingCategory.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.1 as UM

+ 1 - 1
resources/qml/Settings/SettingCheckBox.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.1
 

+ 1 - 1
resources/qml/Settings/SettingComboBox.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.1 as UM

+ 1 - 1
resources/qml/Settings/SettingExtruder.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.1 as UM

+ 1 - 1
resources/qml/Settings/SettingItem.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.1
 

+ 1 - 1
resources/qml/Settings/SettingOptionalExtruder.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.1 as UM

+ 1 - 1
resources/qml/Settings/SettingTextField.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.1 as UM

+ 1 - 1
resources/qml/Settings/SettingUnknown.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 2.1
 
 import UM 1.2 as UM

+ 2 - 2
resources/qml/Settings/SettingView.qml

@@ -1,10 +1,10 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.2
+import QtQuick 2.8
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.2
 
 import UM 1.2 as UM
 import Cura 1.0 as Cura