QComboBox: unify behavior of setModel() and modelReset

When a new model is set, a valid index is selected. When a model is
reset, this is not the case which is slightly inconsistent. Fix it by
using the same logic to find a valid index when the model is reset

Fixes: QTBUG-80998
Change-Id: I6c167511e199a6664343cf1dc3bcd27c65389bfd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 4 insertions, 7 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index ea1b330152..3878e7ccb2 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2756,10 +2756,7 @@ void tst_QComboBox::resetModel()
     class StringListModel : public QStringListModel
     {
     public:
-        StringListModel(const QStringList &list) : QStringListModel(list)
-        {
-        }
-
+        using QStringListModel::QStringListModel;
         void reset()
         {
             QStringListModel::beginResetModel();
@@ -2767,8 +2764,8 @@ void tst_QComboBox::resetModel()
         }
     };
     QComboBox cb;
-    StringListModel model( QStringList() << "1" << "2");
-    QSignalSpy spy(&cb, SIGNAL(currentIndexChanged(int)));
+    StringListModel model({"1", "2"});
+    QSignalSpy spy(&cb, QOverload<int>::of(&QComboBox::currentIndexChanged));
     QCOMPARE(spy.count(), 0);
     QCOMPARE(cb.currentIndex(), -1); //no selection
 
@@ -2779,7 +2776,7 @@ void tst_QComboBox::resetModel()
 
     model.reset();
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(cb.currentIndex(), -1); //no selection
+    QCOMPARE(cb.currentIndex(), 0); //first item selected
 
 }