Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel

This commit is contained in:
Ian Paschal 2018-12-14 16:46:05 +01:00
commit 2112681217

View file

@ -19,7 +19,6 @@ Item
property alias color: label.color
property alias text: label.text
property alias font: label.font
property alias iconColor: icon.color
property real margin: UM.Theme.getSize("narrow_margin").width
// These properties can be used in combination with layouts.