diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/imports/controls/RoundButton.qml | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'src/imports/controls/RoundButton.qml')
| -rw-r--r-- | src/imports/controls/RoundButton.qml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index f6304961..747988d8 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -55,7 +55,6 @@ T.RoundButton { icon.height: 24 icon.color: enabled ? undefined : Default.textDisabledLightColor - //! [contentItem] contentItem: IconLabel { spacing: control.spacing mirrored: control.mirrored @@ -69,9 +68,7 @@ T.RoundButton { : control.down ? Default.textDarkColor : Default.textColor, enabled || control.highlighted || control.checked ? 1 : 0.3) } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 40 implicitHeight: 40 @@ -84,5 +81,4 @@ T.RoundButton { border.color: Default.focusColor border.width: control.visualFocus ? 2 : 0 } - //! [background] } |