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/ComboBox.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/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 5d3274ad..5bbe273b 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -84,12 +84,11 @@ T.ComboBox { validator: control.validator font: control.font - color: !control.editable && control.visualFocus ? Default.focusColor : Default.textColor - selectionColor: Default.focusColor - selectedTextColor: Default.textLightColor + color: !control.editable && control.visualFocus ? Default.focusColor : control.palette.text + selectionColor: control.palette.highlight + selectedTextColor: control.palette.highlightedText horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - opacity: control.enabled ? 1 : 0.3 background: Rectangle { visible: control.editable && !control.flat |