Skip to content

Commit 9f44553

Browse files
committed
QComboBox: Disable items marked as disabled in native popups
Fixes: QTBUG-56064 Pick-to: 6.5 6.2 5.15 Change-Id: I00a17a19b4c14c874e16ec863e794218f0570346 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
1 parent a1ff7f5 commit 9f44553

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/widgets/widgets/qcombobox.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,10 +2501,12 @@ bool QComboBoxPrivate::showNativePopup()
25012501
QVariant textVariant = model->data(rowIndex, Qt::EditRole);
25022502
item->setText(textVariant.toString());
25032503
QVariant iconVariant = model->data(rowIndex, Qt::DecorationRole);
2504+
const Qt::ItemFlags itemFlags = model->flags(rowIndex);
25042505
if (iconVariant.canConvert<QIcon>())
25052506
item->setIcon(iconVariant.value<QIcon>());
25062507
item->setCheckable(true);
25072508
item->setChecked(i == currentIndex);
2509+
item->setEnabled(itemFlags & Qt::ItemIsEnabled);
25082510
if (!currentItem || i == currentIndex)
25092511
currentItem = item;
25102512

0 commit comments

Comments
 (0)