Revert "Render labels using `Text.QtRendering` on OSX"

This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.

2 files changed, 30 insertions, 10 deletions

diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml
index d142335d41..9cdbf0714f 100644
--- a/resources/qml/ActionPanel/PrintJobInformation.qml
+++ b/resources/qml/ActionPanel/PrintJobInformation.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.1
 
-import UM 1.5 as UM
+import UM 1.1 as UM
 import Cura 1.0 as Cura
 
 Column
@@ -26,14 +26,15 @@ Column
         leftPadding: UM.Theme.getSize("default_margin").width
         rightPadding: UM.Theme.getSize("default_margin").width
 
-        UM.Label
+        Label
         {
             text: catalog.i18nc("@label", "Time estimation").toUpperCase()
             color: UM.Theme.getColor("primary")
             font: UM.Theme.getFont("default_bold")
+            renderType: Text.NativeRendering
         }
 
-        UM.Label
+        Label
         {
             id: byLineType
 
@@ -75,13 +76,16 @@ Column
                         Repeater
                         {
                             model: modelData
-                            UM.Label
+                            Label
                             {
                                 width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
                                 height: contentHeight
                                 horizontalAlignment: byLineType.columnHorizontalAligns[index]
+                                color: UM.Theme.getColor("text")
+                                font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData
+                                renderType: Text.NativeRendering
                             }
                         }
                     }
@@ -90,6 +94,9 @@ Column
 
             width: parent.width - 2 * UM.Theme.getSize("default_margin").width
             height: childrenRect.height
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("default")
+            renderType: Text.NativeRendering
             textFormat: Text.RichText
         }
     }
@@ -102,14 +109,15 @@ Column
         leftPadding: UM.Theme.getSize("default_margin").width
         rightPadding: UM.Theme.getSize("default_margin").width
 
-        UM.Label
+        Label
         {
             text: catalog.i18nc("@label", "Material estimation").toUpperCase()
             color: UM.Theme.getColor("primary")
             font: UM.Theme.getFont("default_bold")
+            renderType: Text.NativeRendering
         }
         
-        UM.Label
+        Label
         {
             id: byMaterialType
 
@@ -172,13 +180,16 @@ Column
                         Repeater
                         {
                             model: modelData
-                            UM.Label
+                            Label
                             {
                                 width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
                                 height: contentHeight
                                 horizontalAlignment: byMaterialType.columnHorizontalAligns[index]
+                                color: UM.Theme.getColor("text")
+                                font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData
+                                renderType: Text.NativeRendering
                             }
                         }
                     }
@@ -187,6 +198,9 @@ Column
 
             width: parent.width - 2 * UM.Theme.getSize("default_margin").width
             height: childrenRect.height
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("default")
+            renderType: Text.NativeRendering
             textFormat: Text.RichText
         }
     }
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index cf70e4ba87..58bf736575 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 
-import UM 1.5 as UM
+import UM 1.4 as UM
 import Cura 1.0 as Cura
 
 
@@ -45,13 +45,16 @@ Column
         }
     }
 
-    UM.Label
+    Label
     {
         id: autoSlicingLabel
         width: parent.width
         visible: progressBar.visible
 
         text: catalog.i18nc("@label:PrintjobStatus", "Slicing...")
+        color: UM.Theme.getColor("text")
+        font: UM.Theme.getFont("default")
+        renderType: Text.NativeRendering
     }
     Item
     {
@@ -68,7 +71,7 @@ Column
             height: width
             status: UM.StatusIcon.Status.WARNING
         }
-        UM.Label
+        Label
         {
             id: label
             anchors.left: warningIcon.right
@@ -76,6 +79,9 @@ Column
             anchors.verticalCenter: parent.verticalCenter
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice")
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("default")
+            renderType: Text.NativeRendering
             wrapMode: Text.WordWrap
         }
     }