Merge remote-tracking branch 'origin/main' into PP-3_improved_experimental_bridge_settings

# Conflicts:
#	resources/definitions/ultimaker.def.json

1 files changed, 3 insertions, 7 deletions

diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml
index 619780435d..4123535cc9 100644
--- a/resources/qml/WelcomePages/WelcomeContent.qml
+++ b/resources/qml/WelcomePages/WelcomeContent.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 //
@@ -48,7 +48,7 @@ Item
             width: parent.width
         }
 
-        Label
+        UM.Label
         {
             id: titleLabel
             anchors.horizontalCenter: parent.horizontalCenter
@@ -56,20 +56,16 @@ Item
             text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
             color: UM.Theme.getColor("primary_button")
             font: UM.Theme.getFont("huge_bold")
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: textLabel
             anchors.horizontalCenter: parent.horizontalCenter
             horizontalAlignment: Text.AlignHCenter
             width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width
             text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.")
-            wrapMode: Text.Wrap
             font: UM.Theme.getFont("medium")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
         // Filler item