Merge branch '4.10'

This commit is contained in:
Ghostkeeper 2021-06-15 17:13:25 +02:00
commit cc6a629d92
No known key found for this signature in database
GPG key ID: 14C3586CD2EFC5B9

View file

@ -1,4 +1,4 @@
// Copyright (c) 2017 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
@ -136,10 +136,12 @@ Item
}
ComboBox
Cura.ComboBox
{
id: infillOnlyComboBox
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("setting_control").height
textRole: "text"
model: ListModel
{