diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:02:35 +0200 |
| commit | 9001812730bccd4ee5153ad47aa130b230c27d78 (patch) | |
| tree | c4b3e07ddbfbe8dc09f95dc7cf7afc13698e9efb /src/imports/controls/ComboBox.qml | |
| parent | d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 (diff) | |
| parent | bb4b463c93623635154749e200304d8210b88bda (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I5b112e0e4021191c387da86bb5b0477fe0c4da30
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 69156114..3bca9c02 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -55,7 +55,8 @@ 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 + palette.text: control.palette.text + palette.highlightedText: control.palette.highlightedText font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled |