Merge remote-tracking branch 'origin/3.6'

This commit is contained in:
Lipu Fei 2018-10-25 11:43:06 +02:00
commit 0d0384e331

View file

@ -8,9 +8,6 @@ import UM 1.1 as UM
UM.Dialog {
id: base;
property var printersModel: {
return ListModel{};
}
height: minimumHeight;
leftButtons: [
Button {
@ -87,7 +84,9 @@ UM.Dialog {
id: printerSelectionCombobox;
Behavior on height { NumberAnimation { duration: 100 } }
height: 40 * screenScaleFactor;
model: base.printersModel;
model: ListModel {
id: printersModel;
}
textRole: "name";
width: parent.width;
}