Fix bug where QGCComboBox { model: ListModel would not work correctly

6 years ago · 3b3d3d2d9e
1 changed files with 1 additions and 1 deletions
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@ -37,7 +37,7 @@ ComboBox {
				@@ -37,7 +37,7 @@ ComboBox {
            width:                      control.width

            contentItem: Text {
-                text:                   textRole ? modelData[textRole] : modelData
+                text:                   control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
                color:                  control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText
                verticalAlignment:      Text.AlignVCenter
            }