diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:16:49 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-25 22:17:44 +0300 |
| commit | 93816ce5a52d112b610f8af21ba46d384005a464 (patch) | |
| tree | acc22367aa1619a170a679a94f3f6a31809131c6 /src/imports/controls/Switch.qml | |
| parent | fb3e0ab4ef69166bfdadbecb158573b60cadfe18 (diff) | |
| parent | f2e06ce60a8822d844221e77ca0a66f690855452 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If4e13f09012c80c1043fd0ee82bbddab50b1fad5
Diffstat (limited to 'src/imports/controls/Switch.qml')
| -rw-r--r-- | src/imports/controls/Switch.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 06959732..05f64124 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -64,7 +64,7 @@ T.Switch { text: control.text font: control.font - color: control.enabled ? Default.textDarkColor : Default.textDisabledColor + color: control.palette.windowText elide: Text.ElideRight visible: control.text horizontalAlignment: Text.AlignLeft |