1 files changed, 23 insertions, 18 deletions

diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index ad52e40254..a154baad46 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -718,7 +718,7 @@ void tst_QListView::clicked()
             continue;
         QSignalSpy spy(&view, &QListView::clicked);
         QTest::mouseClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, p);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
     }
 }
 
@@ -1147,7 +1147,7 @@ void tst_QListView::selection()
     v.setSelection(selectionRect, QItemSelectionModel::ClearAndSelect);
 
     const QModelIndexList selected = v.selectionModel()->selectedIndexes();
-    QCOMPARE(selected.count(), expectedItems.count());
+    QCOMPARE(selected.size(), expectedItems.size());
     for (const auto &idx : selected)
         QVERIFY(expectedItems.contains(idx.row()));
 }
@@ -1557,7 +1557,7 @@ void tst_QListView::task203585_selectAll()
     QVERIFY(view.selectionModel()->selectedIndexes().isEmpty());
     view.setRowHidden(0, false);
     view.selectAll();
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 1);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 1);
 }
 
 void tst_QListView::task228566_infiniteRelayout()
@@ -1642,7 +1642,7 @@ void tst_QListView::task196118_visualRegionForSelection()
 
     view.selectionModel()->select(top1.index(), QItemSelectionModel::Select);
 
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 1);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 1);
     QVERIFY(view.getVisualRegionForSelection().isEmpty());
 }
 
@@ -1740,7 +1740,7 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes()
         QTRY_COMPARE(view.currentIndex(), model.index(1, 0));
 
         QModelIndexList selected = view.selectionModel()->selectedIndexes();
-        QCOMPARE(selected.count(), 3);
+        QCOMPARE(selected.size(), 3);
         QVERIFY(!selected.contains(model.index(0, 0)));
     }
     {   // Second test: QListView::TopToBottom flow
@@ -1767,7 +1767,7 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes()
         QTRY_COMPARE(view.currentIndex(), model.index(1, 0));
 
         QModelIndexList selected = view.selectionModel()->selectedIndexes();
-        QCOMPARE(selected.count(), 3);
+        QCOMPARE(selected.size(), 3);
         QVERIFY(!selected.contains(model.index(0, 0)));
     }
 }
@@ -1829,7 +1829,7 @@ void tst_QListView::clickOnViewportClearsSelection()
 
     view.selectAll();
     QModelIndex index = model.index(0);
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 1);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 1);
     QVERIFY(view.selectionModel()->isSelected(index));
 
     //we try to click outside of the index
@@ -1837,7 +1837,7 @@ void tst_QListView::clickOnViewportClearsSelection()
 
     QTest::mousePress(view.viewport(), Qt::LeftButton, {}, point);
     //at this point, the selection shouldn't have changed
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), 1);
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), 1);
     QVERIFY(view.selectionModel()->isSelected(index));
 
     QTest::mouseRelease(view.viewport(), Qt::LeftButton, {}, point);
@@ -1946,7 +1946,7 @@ void tst_QListView::taskQTBUG_435_deselectOnViewportClick()
     view.setModel(&model);
     view.setSelectionMode(QAbstractItemView::ExtendedSelection);
     view.selectAll();
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), model.rowCount());
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), model.rowCount());
 
 
     const QRect itemRect = view.visualRect(model.index(model.rowCount() - 1));
@@ -1956,7 +1956,7 @@ void tst_QListView::taskQTBUG_435_deselectOnViewportClick()
     QVERIFY(!view.selectionModel()->hasSelection());
 
     view.selectAll();
-    QCOMPARE(view.selectionModel()->selectedIndexes().count(), model.rowCount());
+    QCOMPARE(view.selectionModel()->selectedIndexes().size(), model.rowCount());
 
     //and now the right button
     QTest::mouseClick(view.viewport(), Qt::RightButton, {}, p);
@@ -2715,9 +2715,9 @@ public:
         if (idxPar.isValid()) {
             TstMoveItem *parentItem = static_cast<TstMoveItem *>(idxPar.internalPointer());
             Q_ASSERT(parentItem);
-            cnt = parentItem->childItems.count();
+            cnt = parentItem->childItems.size();
         } else {
-            cnt = rootItem->childItems.count();
+            cnt = rootItem->childItems.size();
         }
         return cnt;
     }
@@ -2734,9 +2734,9 @@ public:
         if (parent.isValid()) {
             TstMoveItem *parentItem = static_cast<TstMoveItem *>(parent.internalPointer());
             Q_ASSERT(parentItem);
-            ret = parentItem->childItems.count() > 0;
+            ret = parentItem->childItems.size() > 0;
         } else {
-            ret = rootItem->childItems.count() > 0;
+            ret = rootItem->childItems.size() > 0;
         }
         return ret;
     }
@@ -2758,8 +2758,8 @@ public:
         TstMoveItem *itmDestParent = itemAt(destinationParent);
 
         if (itmSrcParent && sourceRow >= 0
-            && sourceRow + count <= itmSrcParent->childItems.count()
-            && itmDestParent && destinationChild <= itmDestParent->childItems.count()) {
+            && sourceRow + count <= itmSrcParent->childItems.size()
+            && itmDestParent && destinationChild <= itmDestParent->childItems.size()) {
             beginMoveRows(sourceParent, sourceRow, sourceRow + count - 1,
                           destinationParent, destinationChild);
             QList<TstMoveItem *> itemsToMove;
@@ -2767,7 +2767,7 @@ public:
                 TstMoveItem *itm = itmSrcParent->childItems.at(sourceRow+i);
                 itemsToMove.append(itm);
             }
-            for (int i = itemsToMove.count() -1; i >= 0; --i) {
+            for (int i = itemsToMove.size() -1; i >= 0; --i) {
                 TstMoveItem *itm = itemsToMove.at(i);
                 itm->parentItem->childItems.removeAll(itm);
                 itm->parentItem = itmDestParent;
@@ -3056,6 +3056,11 @@ void tst_QListView::spacingWithWordWrap()
         }
     };
 
+    QStyle *oldStyle = QApplication::style();
+    oldStyle->setParent(nullptr);
+    const auto resetStyle = qScopeGuard([oldStyle]{
+        QApplication::setStyle(oldStyle);
+    });
     QApplication::setStyle(new MyStyle(scrollBarOverlap));
 
     const int listViewResizeCount = 200;
@@ -3169,7 +3174,7 @@ void tst_QListView::scrollOnRemove()
     model.removeRow(25);
 
     // if nothing is selected now, then the view should not have scrolled
-    if (!view.selectionModel()->selectedIndexes().count())
+    if (!view.selectionModel()->selectedIndexes().size())
         QTRY_COMPARE(view.verticalScrollBar()->value(), item25Position);
 }