Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__

This commit is contained in:
Ian Paschal 2019-03-04 12:11:57 +01:00
commit 87d4a68c0e
2 changed files with 4 additions and 3 deletions

View file

@ -221,6 +221,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
visible: !cloudConnection
UM.RecolorImage
{
@ -263,4 +264,4 @@ Item
}
}
}
}
}