GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 01:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate iconColor property in the IconWithText component

Browse Source 
Probably it was a mistake in a merge conflict
This commit is contained in:
Diego Prado Gesto 2018-12-17 09:08:32 +01:00
parent 3744509452
commit 36ccef4209
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/qml/IconWithText.qml
View File

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