diff options
Diffstat (limited to 'src/imports/controls/universal/ComboBox.qml')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index f61ab634..0a5701b9 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -58,7 +58,7 @@ T.ComboBox { //! [delegate] delegate: ItemDelegate { width: control.width - text: control.textRole ? model[control.textRole] : modelData + text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData highlighted: control.highlightedIndex === index pressed: highlighted && control.pressed } @@ -116,7 +116,7 @@ T.ComboBox { contentItem: ListView { id: listview clip: true - model: control.delegateModel + model: control.popup.visible ? control.delegateModel : null currentIndex: control.highlightedIndex // ScrollIndicator.vertical: ScrollIndicator { } |