Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup

This commit is contained in:
casper 2022-02-28 16:03:17 +01:00
commit b60c82aa92
17 changed files with 121 additions and 28 deletions

View file

@ -5,7 +5,7 @@ import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import UM 1.3 as UM
import UM 1.5 as UM
import Cura 1.1 as Cura
@ -88,7 +88,7 @@ Cura.MachineAction
}
}
Label
UM.Label
{
id: machineNameLabel
anchors.top: parent.top
@ -97,7 +97,6 @@ Cura.MachineAction
text: Cura.MachineManager.activeMachine.name
horizontalAlignment: Text.AlignHCenter
font: UM.Theme.getFont("large_bold")
renderType: Text.NativeRendering
}
UM.TabRow