From 2807a8d2f8c903deb5b7b3c4c525706e45b8ddaf Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 7 Sep 2015 12:11:48 +0200
Subject: [PATCH] Added support for icons in combo box editor

---
 Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
index 230d60aa66..a360b886a3 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
@@ -87,7 +87,10 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
         m_comboBox->clear();
         if (!options.isEmpty())
         {
-            m_comboBox->addItems(PdmOptionItemInfo::extractUiTexts(options));
+            for (int i = 0; i < options.size(); i++)
+            {
+                m_comboBox->addItem(options[i].icon, options[i].optionUiText);
+            }
             m_comboBox->setCurrentIndex(field()->uiValue().toInt());
         }
         else