aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/basic/ComboBox.qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2023-03-16 09:21:14 +0100
committerUlf Hermann <ulf.hermann@qt.io>2023-03-27 12:52:34 +0100
commit86794e82ea92cff3b36bbb58f813b625f0230e51 (patch)
tree590540d7866c87d9d7fc33dbf33d3f06889d7d8b /src/quickcontrols/basic/ComboBox.qml
parenta841da2c751a712844939080d4ca9ceff594bbde (diff)
Controls: Remove the model/modelData workarounds
Now that model has modelData as anonymous property and also has useful properties for list models, we can remove the workarounds. Change-Id: I744247821fba3c14e5bfff125daeeb7a3128f3b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols/basic/ComboBox.qml')
-rw-r--r--src/quickcontrols/basic/ComboBox.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickcontrols/basic/ComboBox.qml b/src/quickcontrols/basic/ComboBox.qml
index 8cd148e9fe..33d1ef5907 100644
--- a/src/quickcontrols/basic/ComboBox.qml
+++ b/src/quickcontrols/basic/ComboBox.qml
@@ -19,7 +19,7 @@ T.ComboBox {
delegate: ItemDelegate {
width: ListView.view.width
- text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
+ text: model[control.textRole]
palette.text: control.palette.text
palette.highlightedText: control.palette.highlightedText
font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal