From 3b3d3d2d9e8e7e0acf9536f611f8cb4f222baf5d Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Thu, 15 Aug 2019 14:53:03 -0700
Subject: [PATCH] Fix bug where QGCComboBox { model: ListModel would not work
 correctly

---
 src/QmlControls/QGCComboBox.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 8a02e76424..4b4d8ae922 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -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
             }
-- 
GitLab