Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip

This commit is contained in:
Lipu Fei 2019-05-02 14:06:07 +02:00
commit 1e89ce3673
4 changed files with 23 additions and 4 deletions

View file

@ -69,6 +69,7 @@ UM.TooltipArea
background: Rectangle
{
color: UM.Theme.getColor("main_background")
anchors.fill: parent
border.color:
{

View file

@ -76,6 +76,4 @@ NumericTextFieldWithUnit
forceUpdateOnChangeFunction()
}
}
// TODO: add forceUpdateOnChangeFunction:
}