Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash

This commit is contained in:
Lipu Fei 2018-12-14 11:45:51 +01:00
commit cd3a9e02d6
11 changed files with 103 additions and 81 deletions

View file

@ -144,6 +144,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
y: UM.Theme.getSize("thin_margin").height
renderType: Text.NativeRendering
color: UM.Theme.getColor("quality_slider_available")
}
}
}

View file

@ -39,6 +39,7 @@ Item
{
target: Cura.QualityProfilesDropDownMenuModel
onItemsChanged: qualityModel.update()
onDataChanged: qualityModel.update()
}
Connections {