diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:24 +0200 |
| commit | 625a7d1a5cb0b808a734ee7ea1e268c409417349 (patch) | |
| tree | 97fabc7e305af891a2a99694700467ec5af01296 /src/imports/controls/material/CheckIndicator.qml | |
| parent | b4334eed2fd6b5c33dcd464e44c3966deaca2276 (diff) | |
| parent | ca406d69544e6ddf20d940d903c9c97bca07ff90 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia5d3c9705e5832df76bb55753dcf38e340afc5b2
Diffstat (limited to 'src/imports/controls/material/CheckIndicator.qml')
| -rw-r--r-- | src/imports/controls/material/CheckIndicator.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index bfeda537..c52d5ae0 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -43,8 +43,9 @@ Rectangle { implicitWidth: 18 implicitHeight: 18 color: "transparent" - border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor - border.width: control.checked ? width / 2 : 2 + border.color: !control.enabled ? control.Material.hintTextColor + : control.checkState !== Qt.Unchecked ? control.Material.accentColor : control.Material.secondaryTextColor + border.width: control.checkState !== Qt.Unchecked ? width / 2 : 2 radius: 2 property Item control |