diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-31 13:08:12 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-31 13:08:12 +0100 |
| commit | 10972ca272ae59fbe0f18eef6d9237fbd4aaca86 (patch) | |
| tree | 4c2766b234368b2e401dc955bd44faf8088deada /src/imports/controls/SwitchIndicator.qml | |
| parent | e09a8591990e5281929ca2a7bb180bb3a35556ba (diff) | |
| parent | 548b0bdd0f57c2209c8cbd7ac4ecda204cf69a2e (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/CheckIndicator.qml
src/imports/controls/RadioIndicator.qml
src/imports/controls/RangeSlider.qml
src/imports/controls/Slider.qml
src/imports/controls/SwitchIndicator.qml
Change-Id: I32612d2f905ffa02dbaedbb1f84c8237fbd66db3
Diffstat (limited to 'src/imports/controls/SwitchIndicator.qml')
| -rw-r--r-- | src/imports/controls/SwitchIndicator.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml index 37c23d80..362ebfef 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/imports/controls/SwitchIndicator.qml @@ -49,7 +49,6 @@ Item { width: 56 height: 16 radius: 8 - opacity: control.enabled ? 1 : 0.3 color: control.checked ? (control.visualFocus ? Default.focusColor : Default.buttonCheckedColor) : Default.buttonColor border.width: control.visualFocus ? 2 : 0 border.color: Default.focusColor |