From: vsr <vsr@opencascade.com>
Date: Tue, 29 Jul 2008 03:57:09 +0000 (+0000)
Subject: Fix combo box model problems
X-Git-Tag: TG_TRIPOLI_qt4_porting~41
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4090a5c5b516da5704d59ba68e94a558ff87c54e;p=modules%2Fgui.git

Fix combo box model problems
---

diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 25ac78cf7..831cb18c5 100755
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -85,7 +85,8 @@ void QtxComboBox::Model::setCleared( const bool isClear )
 */
 QVariant QtxComboBox::Model::data( const QModelIndex& index, int role ) const
 {
-  return myCleared ? QVariant() : QStandardItemModel::data( index, role );
+  return ( myCleared && ( role == Qt::DisplayRole || role == Qt::DecorationRole ) ) ?
+    QVariant() : QStandardItemModel::data( index, role );
 }
 
 /*!