From 1925abe1749e17aa76e759879af8b8d1c9828fec Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 21 Aug 2024 14:46:16 +0200 Subject: [PATCH] QComboBox: don't call model->index() with row = -1, during reset This leads to an assert in QConcatenateTablesProxyModel::index() for instance. Change-Id: Icd0ae1497705484b021067034c0d8f39049c04ed Reviewed-by: Axel Spoerl (cherry picked from commit 1ba3277b4c79b80788e2d600840876856ec6933d) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/widgets/qcombobox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index ce37bd87d07..4f051867d6c 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1269,7 +1269,7 @@ void QComboBoxPrivate::updateLineEditGeometry() q->initStyleOption(&opt); QRect editRect = q->style()->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxEditField, q); - if (!q->itemIcon(q->currentIndex()).isNull()) { + if (currentIndex.isValid() && !q->itemIcon(q->currentIndex()).isNull()) { QRect comboRect(editRect); editRect.setWidth(editRect.width() - q->iconSize().width() - 4); editRect = QStyle::alignedRect(q->layoutDirection(), Qt::AlignRight,