feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix ComboBox model issue

Browse Source 
This patch enables the ComboBox to properly show models which aren't
raw arrays (e.g. a data model that has multiple named roles).

Change-Id: I126f157e4da04afb768be40190c23720367b3419
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Henning Gruendl
2019-10-02 10:58:40 +02:00
committed by Henning Gründl
parent 005a03ccd4
commit 1347515da6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
View File

@@ -131,7 +131,7 @@ T.ComboBox {
contentItem: Text { contentItem: Text {
leftPadding: itemDelegateIconArea.width leftPadding: itemDelegateIconArea.width
text: modelData text: myComboBox.textRole ? (Array.isArray(myComboBox.model) ? modelData[myComboBox.textRole] : model[myComboBox.textRole]) : modelData
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
font: myComboBox.font font: myComboBox.font
elide: Text.ElideRight elide: Text.ElideRight