diff options
| author | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
|---|---|---|
| committer | p.kuiper <p.kuiper@ultimaker.com> | 2022-05-30 08:59:50 +0300 |
| commit | 0db75501a312dc9561eabfde26fbecef5f137c5a (patch) | |
| tree | 53a934ec39348aabd7b5002739092c9b089a333d /resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml | |
| parent | 9fdeffd564aab5f896bd6405176b7a8491c69303 (diff) | |
| parent | 596c24657d39804c8bc94e6e8f99436115d7e411 (diff) | |
Merge remote-tracking branch 'origin/main' into PP-3_improved_experimental_bridge_settings
# Conflicts:
# resources/definitions/ultimaker.def.json
Diffstat (limited to 'resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml')
| -rw-r--r-- | resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml index 18409dd43a..0bf29c13b7 100644 --- a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.0 as Cura Item @@ -12,14 +12,13 @@ Item width: parent.width height: childrenRect.height - Label + UM.Label { id: header text: catalog.i18nc("@header", "Configurations") font: UM.Theme.getFont("medium") color: UM.Theme.getColor("small_button_text") height: contentHeight - renderType: Text.NativeRendering anchors { |