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/CheckBox.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/CheckBox.qml')
| -rw-r--r-- | src/imports/controls/CheckBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index dcfb54a7..38614b6a 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -51,7 +51,6 @@ T.CheckBox { padding: 6 spacing: 6 - opacity: enabled ? 1 : 0.2 //! [indicator] indicator: CheckIndicator { @@ -73,6 +72,7 @@ T.CheckBox { visible: control.text horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter + opacity: enabled ? 1 : 0.3 } //! [contentItem] } |