diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:32 +0100 |
| commit | 3afec43b69991753416380d88e22b5382b8b0832 (patch) | |
| tree | 15f14aa78ba2a9cc8c118665318e9e5b77282d8b /src/imports/controls/ComboBox.qml | |
| parent | 1a89fbc5a8e9fe6b2711c2e87e9909201c26d499 (diff) | |
| parent | 09181d8b61cf3c84c88258586d68bd721d440620 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 6b7fe008..69156114 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -55,6 +55,7 @@ T.ComboBox { delegate: ItemDelegate { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + palette.text: control.highlightedIndex === index ? control.palette.highlightedText : control.palette.text font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled @@ -132,6 +133,8 @@ T.ComboBox { T.ScrollIndicator.vertical: ScrollIndicator { } } - background: Rectangle { } + background: Rectangle { + color: control.palette.window + } } } |