diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
| commit | 87c1b763147f0dd15e7724fd2a41244dd856613c (patch) | |
| tree | 2212e206ffc9085209776925c3145f1cff8d7493 /src/imports/controls/ComboBox.qml | |
| parent | ea381fba363fcf9b9ef463f24eb90c5e5517fd01 (diff) | |
| parent | 3af18224190d2c008a4ed6fe39b07e60db5dc683 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/universal/CheckDelegate.qml
src/imports/controls/universal/RadioDelegate.qml
src/imports/controls/universal/Switch.qml
src/imports/controls/universal/SwitchDelegate.qml
Change-Id: I9bca4b8d9ce3f6c5c7589daa0ced7d0353f42efc
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/ComboBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index e6a1e8a8..d12cb9fe 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -56,7 +56,7 @@ T.ComboBox { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal - highlighted: control.highlightedIndex == index + highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } |