Port from container::count() and length() to size() - V5

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:

    const std::string o = "object";

    auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };

    auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
        auto exprOfDeclaredType = [&](auto decl) {
            return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
        };
        return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
    };

    auto renameMethod = [&] (ArrayRef<StringRef> classes,
                            StringRef from, StringRef to) {
        return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
                            callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
                        changeTo(cat(access(o, cat(to)), "()")),
                        cat("use '", to, "' instead of '", from, "'"));
    };

    renameMethod(<classes>, "count", "size");
    renameMethod(<classes>, "length", "size");

except that the on() matcher has been replaced by one that doesn't
ignoreParens().

a.k.a qt-port-to-std-compatible-api V5 with config Scope: 'Container'.

Added two NOLINTNEXTLINEs in tst_qbitarray and tst_qcontiguouscache,
to avoid porting calls that explicitly test count().

Change-Id: Icfb8808c2ff4a30187e9935a51cad26987451c22
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

9 files changed, 154 insertions, 154 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 8b4d8b0b68..e1cccaadc9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -1663,7 +1663,7 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
 
     // Determine amount of widgets to add.
     int widgetCount = -1;
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         widgetCount = qMax(widgetCount, item.firstIndex);
         widgetCount = qMax(widgetCount, item.secondIndex);
@@ -1678,7 +1678,7 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
     // Setup anchor layout
     TheAnchorLayout *layout = new TheAnchorLayout;
 
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         layout->setAnchor(
             getItem(item.firstIndex, widgets, layout),
@@ -1695,7 +1695,7 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
     QCOMPARE(widget->size(), size);
 
     // Validate
-    for (int i = 0; i < result.count(); ++i) {
+    for (int i = 0; i < result.size(); ++i) {
         const BasicLayoutTestResult item = result[i];
         QRectF expected = item.rect;
         QRectF actual = widgets[item.index]->geometry();
@@ -1707,7 +1707,7 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
     widget->setLayoutDirection(Qt::RightToLeft);
     layout->activate();
     // Validate
-    for (int j = 0; j < result.count(); ++j) {
+    for (int j = 0; j < result.size(); ++j) {
         const BasicLayoutTestResult item = result[j];
         QRectF mirroredRect(item.rect);
         // only valid cases are mirrored
@@ -2168,7 +2168,7 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
 
     // Determine amount of widgets to add.
     int widgetCount = -1;
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         widgetCount = qMax(widgetCount, item.firstIndex);
         widgetCount = qMax(widgetCount, item.secondIndex);
@@ -2185,7 +2185,7 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
     // Setup anchor layout
     TheAnchorLayout *layout = new TheAnchorLayout;
 
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         layout->setAnchor(
             getItem(item.firstIndex, widgets, layout),
@@ -2195,7 +2195,7 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
             item.spacing );
     }
 
-    for (int i = 0; i < removeData.count(); ++i) {
+    for (int i = 0; i < removeData.size(); ++i) {
         const BasicLayoutTestData item = removeData[i];
         layout->removeAnchor(
             getItem(item.firstIndex, widgets, layout),
@@ -2211,7 +2211,7 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
     QCOMPARE(widget->size(), size);
 
     // Validate
-    for (int i = 0; i < result.count(); ++i) {
+    for (int i = 0; i < result.size(); ++i) {
         const BasicLayoutTestResult item = result[i];
 
         QCOMPARE(widgets[item.index]->geometry(), item.rect);
@@ -2999,7 +2999,7 @@ void tst_QGraphicsAnchorLayout1::testComplexCases()
 
     // Determine amount of widgets to add.
     int widgetCount = -1;
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         widgetCount = qMax(widgetCount, item.firstIndex);
         widgetCount = qMax(widgetCount, item.secondIndex);
@@ -3025,7 +3025,7 @@ void tst_QGraphicsAnchorLayout1::testComplexCases()
     // Setup anchor layout
     TheAnchorLayout *layout = new TheAnchorLayout;
 
-    for (int i = 0; i < data.count(); ++i) {
+    for (int i = 0; i < data.size(); ++i) {
         const BasicLayoutTestData item = data[i];
         layout->setAnchor(
             getItem(item.firstIndex, widgets, layout),
@@ -3042,7 +3042,7 @@ void tst_QGraphicsAnchorLayout1::testComplexCases()
     QCOMPARE(widget->size(), size);
 
     // Validate
-    for (int i = 0; i < result.count(); ++i) {
+    for (int i = 0; i < result.size(); ++i) {
         const BasicLayoutTestResult item = result[i];
         QCOMPARE(widgets[item.index]->geometry(), item.rect);
     }
@@ -3051,7 +3051,7 @@ void tst_QGraphicsAnchorLayout1::testComplexCases()
     widget->setLayoutDirection(Qt::RightToLeft);
     layout->activate();
     // Validate
-    for (int j = 0; j < result.count(); ++j) {
+    for (int j = 0; j < result.size(); ++j) {
         const BasicLayoutTestResult item = result[j];
         QRectF mirroredRect(item.rect);
         // only valid cases are mirrored
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index f4b3a5ef99..9af5433388 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -1658,7 +1658,7 @@ void tst_QGraphicsGridLayout::sizeHint()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2159,7 +2159,7 @@ void tst_QGraphicsGridLayout::defaultStretchFactors()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2174,7 +2174,7 @@ void tst_QGraphicsGridLayout::defaultStretchFactors()
         widget->resize(newSize);
 
     QApplication::sendPostedEvents(0, 0);
-    for (i = 0; i < expectedSizes.count(); ++i) {
+    for (i = 0; i < expectedSizes.size(); ++i) {
         QSizeF itemSize = layout->itemAt(i)->geometry().size();
         QCOMPARE(itemSize, expectedSizes.at(i));
     }
@@ -2318,7 +2318,7 @@ void tst_QGraphicsGridLayout::alignment2()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2333,7 +2333,7 @@ void tst_QGraphicsGridLayout::alignment2()
         widget->resize(newSize);
 
     QApplication::sendPostedEvents(0, 0);
-    for (i = 0; i < expectedGeometries.count(); ++i) {
+    for (i = 0; i < expectedGeometries.size(); ++i) {
         QRectF itemRect = layout->itemAt(i)->geometry();
         QCOMPARE(itemRect, expectedGeometries.at(i));
     }
@@ -2896,7 +2896,7 @@ void tst_QGraphicsGridLayout::geometries()
     widget->setContentsMargins(0, 0, 0, 0);
 
     int i;
-    for (i = 0; i < itemDescriptions.count(); ++i) {
+    for (i = 0; i < itemDescriptions.size(); ++i) {
         ItemDesc desc = itemDescriptions.at(i);
         RectWidget *item = new RectWidget(widget);
         desc.apply(layout, item);
@@ -2911,7 +2911,7 @@ void tst_QGraphicsGridLayout::geometries()
         widget->resize(newSize);
 
     QApplication::processEvents();
-    for (i = 0; i < expectedGeometries.count(); ++i) {
+    for (i = 0; i < expectedGeometries.size(); ++i) {
         QRectF itemRect = layout->itemAt(i)->geometry();
         QCOMPARE(itemRect, expectedGeometries.at(i));
     }
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 7f9dea5601..93d116242a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -2208,7 +2208,7 @@ void tst_QGraphicsItem::setTransform()
     scene.update(scene.sceneRect());
     QCoreApplication::processEvents();
 
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     item.setTransform(QTransform().rotate(qreal(12.34)));
     QRectF rotatedRect = scene.sceneRect();
@@ -2216,14 +2216,14 @@ void tst_QGraphicsItem::setTransform()
     scene.update(scene.sceneRect());
     QCoreApplication::processEvents();
 
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     item.setTransform(QTransform());
 
     scene.update(scene.sceneRect());
     QCoreApplication::processEvents();
 
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
     QList<QRectF> rlist = qvariant_cast<QList<QRectF> >(spy.last().at(0));
 
     QCOMPARE(rlist.size(), 2);
@@ -8228,7 +8228,7 @@ void tst_QGraphicsItem::sorting()
         QVERIFY(QTest::qWaitForWindowActive(&view));
     }
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    QTRY_VERIFY(_paintedItems.count() > 0);
+    QTRY_VERIFY(_paintedItems.size() > 0);
 
     _paintedItems.clear();
 
@@ -11704,7 +11704,7 @@ public:
         QLatin1String wiseWords("AZ BUKI VEDI");
         QString sentence(wiseWords);
         QStringList words = sentence.split(QLatin1Char(' '), Qt::SkipEmptyParts);
-        for (int i = 0; i < words.count(); ++i) {
+        for (int i = 0; i < words.size(); ++i) {
             QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget(this);
             QLabel *label = new QLabel(words.at(i));
             proxy->setWidget(label);
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 83e03b9c58..e8fc027117 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -1121,7 +1121,7 @@ void tst_QGraphicsLinearLayout::setStretchFactor()
 
 
     int i;
-    for (i = 0; i < stretches.count(); ++i) {
+    for (i = 0; i < stretches.size(); ++i) {
         QGraphicsWidget *item = new RectWidget(widget);
         item->setMinimumSize(5,5);
         item->setPreferredSize(10,5);
@@ -1139,7 +1139,7 @@ void tst_QGraphicsLinearLayout::setStretchFactor()
     qreal firstStretch = -1;
     qreal firstExtent = -1.;
     qreal sumExtent = 0;
-    for (i = 0; i < stretches.count(); ++i) {
+    for (i = 0; i < stretches.size(); ++i) {
         QGraphicsWidget *item = static_cast<QGraphicsWidget*>(layout.itemAt(i));
         qreal extent = item->size().width();
         qreal stretch = (qreal)stretches.at(i);
@@ -1297,7 +1297,7 @@ void tst_QGraphicsLinearLayout::defaultStretchFactors()
         QSizeF itemSize = layout->itemAt(i)->geometry().size();
         if (orientation == Qt::Vertical)
             itemSize.transpose();
-        if (i < expectedSizes.count())
+        if (i < expectedSizes.size())
             QCOMPARE(itemSize.width(), qreal(expectedSizes.at(i)));
     }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
index 849ac19d25..bade098023 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -41,28 +41,28 @@ void tst_QGraphicsObject::pos()
     QSignalSpy ySpy(&object, SIGNAL(yChanged()));
     QVERIFY(object.pos() == QPointF(0, 0));
     object.setPos(10, 10);
-    QCOMPARE(xSpy.count(), 1);
-    QCOMPARE(ySpy.count(), 1);
+    QCOMPARE(xSpy.size(), 1);
+    QCOMPARE(ySpy.size(), 1);
 
     QCOMPARE(object.pos(), QPointF(10,10));
 
     object.setPos(10, 10);
-    QCOMPARE(xSpy.count(), 1);
-    QCOMPARE(ySpy.count(), 1);
+    QCOMPARE(xSpy.size(), 1);
+    QCOMPARE(ySpy.size(), 1);
 
     object.setProperty("pos", QPointF(0, 0));
-    QCOMPARE(xSpy.count(), 2);
-    QCOMPARE(ySpy.count(), 2);
+    QCOMPARE(xSpy.size(), 2);
+    QCOMPARE(ySpy.size(), 2);
     QCOMPARE(object.property("pos").toPointF(), QPointF(0,0));
 
     object.setProperty("pos", QPointF(10, 0));
-    QCOMPARE(xSpy.count(), 3);
-    QCOMPARE(ySpy.count(), 2);
+    QCOMPARE(xSpy.size(), 3);
+    QCOMPARE(ySpy.size(), 2);
     QCOMPARE(object.property("pos").toPointF(), QPointF(10,0));
 
     object.setProperty("pos", QPointF(10, 10));
-    QCOMPARE(xSpy.count(), 3);
-    QCOMPARE(ySpy.count(), 3);
+    QCOMPARE(xSpy.size(), 3);
+    QCOMPARE(ySpy.size(), 3);
     QVERIFY(object.property("pos") == QPointF(10, 10));
 }
 
@@ -73,19 +73,19 @@ void tst_QGraphicsObject::x()
     QSignalSpy ySpy(&object, SIGNAL(yChanged()));
     QVERIFY(object.pos() == QPointF(0, 0));
     object.setX(10);
-    QCOMPARE(xSpy.count(), 1);
-    QCOMPARE(ySpy.count(), 0);
+    QCOMPARE(xSpy.size(), 1);
+    QCOMPARE(ySpy.size(), 0);
 
     QVERIFY(object.pos() == QPointF(10, 0));
     QCOMPARE(object.x(), qreal(10));
 
     object.setX(10);
-    QCOMPARE(xSpy.count(), 1);
-    QCOMPARE(ySpy.count(), 0);
+    QCOMPARE(xSpy.size(), 1);
+    QCOMPARE(ySpy.size(), 0);
 
     object.setProperty("x", 0);
-    QCOMPARE(xSpy.count(), 2);
-    QCOMPARE(ySpy.count(), 0);
+    QCOMPARE(xSpy.size(), 2);
+    QCOMPARE(ySpy.size(), 0);
     QCOMPARE(object.property("x").toDouble(), double(0));
 }
 
@@ -96,19 +96,19 @@ void tst_QGraphicsObject::y()
     QSignalSpy ySpy(&object, SIGNAL(yChanged()));
     QVERIFY(object.pos() == QPointF(0, 0));
     object.setY(10);
-    QCOMPARE(xSpy.count(), 0);
-    QCOMPARE(ySpy.count(), 1);
+    QCOMPARE(xSpy.size(), 0);
+    QCOMPARE(ySpy.size(), 1);
 
     QVERIFY(object.pos() == QPointF(0, 10));
     QCOMPARE(object.y(), qreal(10));
 
     object.setY(10);
-    QCOMPARE(xSpy.count(), 0);
-    QCOMPARE(ySpy.count(), 1);
+    QCOMPARE(xSpy.size(), 0);
+    QCOMPARE(ySpy.size(), 1);
 
     object.setProperty("y", 0);
-    QCOMPARE(xSpy.count(), 0);
-    QCOMPARE(ySpy.count(), 2);
+    QCOMPARE(xSpy.size(), 0);
+    QCOMPARE(ySpy.size(), 2);
     QCOMPARE(object.property("y").toDouble(), qreal(0));
 }
 
@@ -118,15 +118,15 @@ void tst_QGraphicsObject::z()
     QSignalSpy zSpy(&object, SIGNAL(zChanged()));
     QCOMPARE(object.zValue(), qreal(0));
     object.setZValue(10);
-    QCOMPARE(zSpy.count(), 1);
+    QCOMPARE(zSpy.size(), 1);
 
     QCOMPARE(object.zValue(), qreal(10));
 
     object.setZValue(10);
-    QCOMPARE(zSpy.count(), 1);
+    QCOMPARE(zSpy.size(), 1);
 
     object.setProperty("z", 0);
-    QCOMPARE(zSpy.count(), 2);
+    QCOMPARE(zSpy.size(), 2);
     QCOMPARE(object.property("z").toDouble(), double(0));
 }
 
@@ -136,15 +136,15 @@ void tst_QGraphicsObject::opacity()
     QSignalSpy spy(&object, SIGNAL(opacityChanged()));
     QCOMPARE(object.opacity(), 1.);
     object.setOpacity(0);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QCOMPARE(object.opacity(), 0.);
 
     object.setOpacity(0);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     object.setProperty("opacity", .5);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QCOMPARE(object.property("opacity").toDouble(), .5);
 }
 
@@ -154,15 +154,15 @@ void tst_QGraphicsObject::enabled()
     QSignalSpy spy(&object, SIGNAL(enabledChanged()));
     QVERIFY(object.isEnabled());
     object.setEnabled(false);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QVERIFY(!object.isEnabled());
 
     object.setEnabled(false);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     object.setProperty("enabled", true);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QVERIFY(object.property("enabled").toBool());
 }
 
@@ -172,15 +172,15 @@ void tst_QGraphicsObject::visible()
     QSignalSpy spy(&object, SIGNAL(visibleChanged()));
     QVERIFY(object.isVisible());
     object.setVisible(false);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QVERIFY(!object.isVisible());
 
     object.setVisible(false);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     object.setProperty("visible", true);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QVERIFY(object.property("visible").toBool());
 }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 3cb0925e59..4562ac3a84 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -945,7 +945,7 @@ void tst_QGraphicsProxyWidget::hoverEnterLeaveEvent()
     proxy->setPos(50, 0);
     QSignalSpy sceneChangedSpy(&scene, &QGraphicsScene::changed);
     scene.addItem(proxy);
-    QTRY_VERIFY(sceneChangedSpy.count() > 0);
+    QTRY_VERIFY(sceneChangedSpy.size() > 0);
 
     // outside graphics item
     QTest::mouseMove(&view, QPoint(10, 10));
@@ -1043,9 +1043,9 @@ void tst_QGraphicsProxyWidget::keyReleaseEvent()
     proxy->setFocus();
 
     QTest::keyPress(view.viewport(), Qt::Key_Space);
-    QTRY_COMPARE(spy.count(), 0);
+    QTRY_COMPARE(spy.size(), 0);
     QTest::keyRelease(view.viewport(), Qt::Key_Space);
-    QTRY_COMPARE(spy.count(), hasWidget ? 1 : 0);
+    QTRY_COMPARE(spy.size(), hasWidget ? 1 : 0);
 }
 
 // protected void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event)
@@ -1073,7 +1073,7 @@ void tst_QGraphicsProxyWidget::mouseDoubleClickEvent()
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QCOMPARE(QApplication::activeWindow(), (QWidget*)&view);
     // wait for scene to be updated before doing any coordinate mappings on it
-    QTRY_VERIFY(sceneChangedSpy.count() > 0);
+    QTRY_VERIFY(sceneChangedSpy.size() > 0);
 
     QPoint pointInLineEdit = view.mapFromScene(proxy->mapToScene(15, proxy->boundingRect().center().y()));
     QTest::mousePress(view.viewport(), Qt::LeftButton, {}, pointInLineEdit);
@@ -1114,13 +1114,13 @@ void tst_QGraphicsProxyWidget::mousePressReleaseEvent()
     proxy->setFocus();
 
     // wait for scene to be updated before doing any coordinate mappings on it
-    QTRY_VERIFY(sceneChangedSpy.count() > 0);
+    QTRY_VERIFY(sceneChangedSpy.size() > 0);
 
     QPoint buttonCenter = view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center()));
     QTest::mousePress(view.viewport(), Qt::LeftButton, {}, buttonCenter);
-    QTRY_COMPARE(spy.count(), 0);
+    QTRY_COMPARE(spy.size(), 0);
     QTest::mouseRelease(view.viewport(), Qt::LeftButton, {}, buttonCenter);
-    QTRY_COMPARE(spy.count(), hasWidget ? 1 : 0);
+    QTRY_COMPARE(spy.size(), hasWidget ? 1 : 0);
 }
 
 void tst_QGraphicsProxyWidget::resizeEvent_data()
@@ -1171,7 +1171,7 @@ void tst_QGraphicsProxyWidget::paintEvent()
     QSignalSpy sceneChangedSpy(&scene, &QGraphicsScene::changed);
     scene.addItem(&proxy);
 
-    QTRY_VERIFY(sceneChangedSpy.count() > 0); // make sure the scene is ready
+    QTRY_VERIFY(sceneChangedSpy.size() > 0); // make sure the scene is ready
 
     proxy.paintCount = 0;
     w->update();
@@ -2410,7 +2410,7 @@ void tst_QGraphicsProxyWidget::changingCursor_basic()
     proxy->setWidget(widget);
     QSignalSpy sceneChangedSpy(&scene, &QGraphicsScene::changed);
     scene.addItem(proxy);
-    QTRY_VERIFY(sceneChangedSpy.count() > 0); // make sure the scene is ready
+    QTRY_VERIFY(sceneChangedSpy.size() > 0); // make sure the scene is ready
 
     // in
     QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
@@ -2628,7 +2628,7 @@ void tst_QGraphicsProxyWidget::windowOpacity()
     QTRY_COMPARE(eventSpy.counts[QEvent::UpdateRequest], 0);
     QTRY_COMPARE(eventSpy.counts[QEvent::Paint], paints);
 
-    QTRY_COMPARE(signalSpy.count(), 1);
+    QTRY_COMPARE(signalSpy.size(), 1);
     const QList<QVariant> arguments = signalSpy.takeFirst();
     const QList<QRectF> updateRects = qvariant_cast<QList<QRectF> >(arguments.at(0));
     QCOMPARE(updateRects.size(), 1);
@@ -2903,10 +2903,10 @@ void tst_QGraphicsProxyWidget::createProxyForChildWidget()
 
     QTest::mousePress(view.viewport(), Qt::LeftButton, {},
                       view.mapFromScene(checkboxProxy->mapToScene(QPointF(8,8))));
-    QTRY_COMPARE(spy.count(), 0);
+    QTRY_COMPARE(spy.size(), 0);
     QTest::mouseRelease(view.viewport(), Qt::LeftButton, {},
                         view.mapFromScene(checkboxProxy->mapToScene(QPointF(8,8))));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE(spy.size(), 1);
 
 
 
@@ -3702,27 +3702,27 @@ void tst_QGraphicsProxyWidget::wheelEventPropagation()
     // accepted by the embedded widget
     QCOMPARE(view.itemAt(wheelPosition), nullptr);
     wheelUp(Qt::NoScrollPhase);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
 
     // wheeling on the label, which ignores the event, should scroll the view
     QCOMPARE(view.itemAt(wheelPosition), labelProxy);
     wheelUp(Qt::NoScrollPhase);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
     QCOMPARE(view.itemAt(wheelPosition), labelProxy);
     wheelUp(Qt::NoScrollPhase);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
 
     // left the widget
     QCOMPARE(view.itemAt(wheelPosition), nullptr);
     wheelUp(Qt::NoScrollPhase);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
 
     // reached the nested widget, which accepts the wheel event, so no more scrolling
     QCOMPARE(view.itemAt(wheelPosition), nestedProxy);
     // remember this position for later
     const int scrollBarValueOnNestedProxy = view.verticalScrollBar()->value();
     wheelUp(Qt::NoScrollPhase);
-    QCOMPARE(scrollSpy.count(), scrollCount);
+    QCOMPARE(scrollSpy.size(), scrollCount);
     QCOMPARE(nestedWidget->wheelEventCount, 1);
 
     // reset, try with kinetic events
@@ -3733,41 +3733,41 @@ void tst_QGraphicsProxyWidget::wheelEventPropagation()
     // no matter if the widget accepts wheel events - the view has the grab
     QCOMPARE(view.itemAt(wheelPosition), nullptr);
     wheelUp(Qt::ScrollBegin);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
     for (int i = 0; i < 5; ++i) {
         wheelUp(Qt::ScrollUpdate);
-        QCOMPARE(scrollSpy.count(), ++scrollCount);
+        QCOMPARE(scrollSpy.size(), ++scrollCount);
     }
     wheelUp(Qt::ScrollEnd);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
 
     // reset
     view.verticalScrollBar()->setValue(0);
-    scrollCount = scrollSpy.count();
+    scrollCount = scrollSpy.size();
 
     // starting a scroll on a widget that doesn't accept wheel events
     // should also scroll the view, which still gets the grab
     wheelUp(Qt::NoScrollPhase);
-    scrollCount = scrollSpy.count();
+    scrollCount = scrollSpy.size();
 
     QCOMPARE(view.itemAt(wheelPosition), labelProxy);
     wheelUp(Qt::ScrollBegin);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
     for (int i = 0; i < 5; ++i) {
         wheelUp(Qt::ScrollUpdate);
-        QCOMPARE(scrollSpy.count(), ++scrollCount);
+        QCOMPARE(scrollSpy.size(), ++scrollCount);
     }
     wheelUp(Qt::ScrollEnd);
-    QCOMPARE(scrollSpy.count(), ++scrollCount);
+    QCOMPARE(scrollSpy.size(), ++scrollCount);
 
     // starting a scroll on a widget that does accept wheel events
     // should not scroll the view
     view.verticalScrollBar()->setValue(scrollBarValueOnNestedProxy);
-    scrollCount = scrollSpy.count();
+    scrollCount = scrollSpy.size();
 
     QCOMPARE(view.itemAt(wheelPosition), nestedProxy);
     wheelUp(Qt::ScrollBegin);
-    QCOMPARE(scrollSpy.count(), scrollCount);
+    QCOMPARE(scrollSpy.size(), scrollCount);
 }
 #endif // QT_CONFIG(wheelevent)
 
@@ -3969,7 +3969,7 @@ void tst_QGraphicsProxyWidget::touchEventPropagation()
     QCOMPARE(record.receiver, view.windowHandle());
     QCOMPARE(record.eventType, QEvent::TouchEnd);
     QCOMPARE(eventSpy.mousePressReceiver, pushButton1);
-    QCOMPARE(clickedSpy.count(), 1);
+    QCOMPARE(clickedSpy.size(), 1);
     eventSpy.clear();
     clickedSpy.clear();
 
@@ -4037,7 +4037,7 @@ void tst_QGraphicsProxyWidget::touchEventPropagation()
     QCOMPARE(eventSpy.at(0, 3).receiver, touchWidget2);
     QCOMPARE(eventSpy.at(1, 3).receiver, touchWidget2);
     QCOMPARE(eventSpy.at(2, 3).receiver, touchWidget2);
-    QCOMPARE(clickedSpy.count(), 0); // multi-touch event does not synthesize a mouse event
+    QCOMPARE(clickedSpy.size(), 0); // multi-touch event does not synthesize a mouse event
 }
 
 QTEST_MAIN(tst_QGraphicsProxyWidget)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 473d3df0b8..f42670e4bd 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -321,27 +321,27 @@ void tst_QGraphicsScene::sceneRect()
     QGraphicsScene scene;
     QSignalSpy sceneRectChanged(&scene, &QGraphicsScene::sceneRectChanged);
     QCOMPARE(scene.sceneRect(), QRectF());
-    QCOMPARE(sceneRectChanged.count(), 0);
+    QCOMPARE(sceneRectChanged.size(), 0);
 
     QGraphicsRectItem *item = scene.addRect(QRectF(0, 0, 10, 10));
     item->setPen(QPen(Qt::black, 0));
     item->setPos(-5, -5);
-    QCOMPARE(sceneRectChanged.count(), 0);
+    QCOMPARE(sceneRectChanged.size(), 0);
 
     QCOMPARE(itemAt(scene, 0, 0), item);
     QVERIFY(scene.items(QPointF(10, 10)).isEmpty());
-    QCOMPARE(sceneRectChanged.count(), 0);
+    QCOMPARE(sceneRectChanged.size(), 0);
     QCOMPARE(scene.sceneRect(), QRectF(-5, -5, 10, 10));
-    QCOMPARE(sceneRectChanged.count(), 1);
+    QCOMPARE(sceneRectChanged.size(), 1);
     QCOMPARE(sceneRectChanged.last().at(0).toRectF(), scene.sceneRect());
 
     item->setPos(0, 0);
     QCOMPARE(scene.sceneRect(), QRectF(-5, -5, 15, 15));
-    QCOMPARE(sceneRectChanged.count(), 2);
+    QCOMPARE(sceneRectChanged.size(), 2);
     QCOMPARE(sceneRectChanged.last().at(0).toRectF(), scene.sceneRect());
 
     scene.setSceneRect(-100, -100, 10, 10);
-    QCOMPARE(sceneRectChanged.count(), 3);
+    QCOMPARE(sceneRectChanged.size(), 3);
     QCOMPARE(sceneRectChanged.last().at(0).toRectF(), scene.sceneRect());
 
     QCOMPARE(itemAt(scene, 0, 0), item);
@@ -349,16 +349,16 @@ void tst_QGraphicsScene::sceneRect()
     QCOMPARE(scene.sceneRect(), QRectF(-100, -100, 10, 10));
     item->setPos(10, 10);
     QCOMPARE(scene.sceneRect(), QRectF(-100, -100, 10, 10));
-    QCOMPARE(sceneRectChanged.count(), 3);
+    QCOMPARE(sceneRectChanged.size(), 3);
     QCOMPARE(sceneRectChanged.last().at(0).toRectF(), scene.sceneRect());
 
     scene.setSceneRect(QRectF());
 
     QCOMPARE(itemAt(scene, 10, 10), item);
     QVERIFY(scene.items(QPointF(20, 20)).isEmpty());
-    QCOMPARE(sceneRectChanged.count(), 4);
+    QCOMPARE(sceneRectChanged.size(), 4);
     QCOMPARE(scene.sceneRect(), QRectF(-5, -5, 25, 25));
-    QCOMPARE(sceneRectChanged.count(), 5);
+    QCOMPARE(sceneRectChanged.size(), 5);
     QCOMPARE(sceneRectChanged.last().at(0).toRectF(), scene.sceneRect());
 }
 
@@ -946,32 +946,32 @@ void tst_QGraphicsScene::selectionChanged()
 {
     QGraphicsScene scene(0, 0, 1000, 1000);
     QSignalSpy spy(&scene, &QGraphicsScene::selectionChanged);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     QPainterPath path;
     path.addRect(scene.sceneRect());
     QCOMPARE(scene.selectionArea(), QPainterPath());
     scene.setSelectionArea(path);
     QCOMPARE(scene.selectionArea(), path);
-    QCOMPARE(spy.count(), 0); // selection didn't change
+    QCOMPARE(spy.size(), 0); // selection didn't change
     QVERIFY(scene.selectedItems().isEmpty());
 
     QGraphicsItem *rect = scene.addRect(QRectF(0, 0, 100, 100));
-    QCOMPARE(spy.count(), 0); // selection didn't change
+    QCOMPARE(spy.size(), 0); // selection didn't change
 
     rect->setSelected(true);
     QVERIFY(!rect->isSelected());
-    QCOMPARE(spy.count(), 0); // selection didn't change, item isn't selectable
+    QCOMPARE(spy.size(), 0); // selection didn't change, item isn't selectable
 
     rect->setFlag(QGraphicsItem::ItemIsSelectable);
     rect->setSelected(true);
     QVERIFY(rect->isSelected());
-    QCOMPARE(spy.count(), 1); // selection changed
+    QCOMPARE(spy.size(), 1); // selection changed
     QCOMPARE(scene.selectedItems(), {rect});
 
     rect->setSelected(false);
     QVERIFY(!rect->isSelected());
-    QCOMPARE(spy.count(), 2); // selection changed
+    QCOMPARE(spy.size(), 2); // selection changed
     QVERIFY(scene.selectedItems().isEmpty());
 
     QGraphicsEllipseItem *parentItem = new QGraphicsEllipseItem(QRectF(0, 0, 100, 100));
@@ -983,33 +983,33 @@ void tst_QGraphicsScene::selectionChanged()
     grandChildItem->setSelected(true);
     scene.addItem(parentItem);
 
-    QCOMPARE(spy.count(), 3); // the grandchild was added, so the selection changed once
+    QCOMPARE(spy.size(), 3); // the grandchild was added, so the selection changed once
 
     scene.removeItem(parentItem);
-    QCOMPARE(spy.count(), 4); // the grandchild was removed, so the selection changed
+    QCOMPARE(spy.size(), 4); // the grandchild was removed, so the selection changed
 
     rect->setSelected(true);
-    QCOMPARE(spy.count(), 5); // the rect was reselected, so the selection changed
+    QCOMPARE(spy.size(), 5); // the rect was reselected, so the selection changed
 
     scene.clearSelection();
-    QCOMPARE(spy.count(), 6); // the scene selection was cleared
+    QCOMPARE(spy.size(), 6); // the scene selection was cleared
 
     rect->setSelected(true);
-    QCOMPARE(spy.count(), 7); // the rect was reselected, so the selection changed
+    QCOMPARE(spy.size(), 7); // the rect was reselected, so the selection changed
 
     rect->setFlag(QGraphicsItem::ItemIsSelectable, false);
-    QCOMPARE(spy.count(), 8); // the rect was unselected, so the selection changed
+    QCOMPARE(spy.size(), 8); // the rect was unselected, so the selection changed
 
     rect->setSelected(true);
-    QCOMPARE(spy.count(), 8); // the rect is not longer selectable, so the selection does not change
+    QCOMPARE(spy.size(), 8); // the rect is not longer selectable, so the selection does not change
 
 
     rect->setFlag(QGraphicsItem::ItemIsSelectable, true);
     rect->setSelected(true);
-    QCOMPARE(spy.count(), 9); // the rect is again selectable, so the selection changed
+    QCOMPARE(spy.size(), 9); // the rect is again selectable, so the selection changed
 
     delete rect;
-    QCOMPARE(spy.count(), 10); // a selected item was deleted; selection changed
+    QCOMPARE(spy.size(), 10); // a selected item was deleted; selection changed
 }
 
 void tst_QGraphicsScene::selectionChanged2()
@@ -1022,7 +1022,7 @@ void tst_QGraphicsScene::selectionChanged2()
     item1->setFlag(QGraphicsItem::ItemIsSelectable);
     item2->setFlag(QGraphicsItem::ItemIsSelectable);
 
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     {
         QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress);
         event.setScenePos(QPointF(50, 50));
@@ -1037,7 +1037,7 @@ void tst_QGraphicsScene::selectionChanged2()
     }
     QVERIFY(item1->isSelected());
     QVERIFY(!item2->isSelected());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     {
         QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress);
         event.setScenePos(QPointF(150, 150));
@@ -1052,7 +1052,7 @@ void tst_QGraphicsScene::selectionChanged2()
     }
     QVERIFY(!item1->isSelected());
     QVERIFY(item2->isSelected());
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     {
         QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMousePress);
         event.setScenePos(QPointF(50, 50));
@@ -1062,7 +1062,7 @@ void tst_QGraphicsScene::selectionChanged2()
     }
     QVERIFY(!item1->isSelected());
     QVERIFY(item2->isSelected());
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     {
         QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseRelease);
         event.setScenePos(QPointF(50, 50));
@@ -1071,7 +1071,7 @@ void tst_QGraphicsScene::selectionChanged2()
     }
     QVERIFY(item1->isSelected());
     QVERIFY(!item2->isSelected());
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 }
 
 void tst_QGraphicsScene::addItem()
@@ -2834,7 +2834,7 @@ void tst_QGraphicsScene::update()
     QCoreApplication::processEvents();
 
     // Check that the update region is correct
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QRectF region;
     const auto &rects = qvariant_cast<QList<QRectF> >(spy.at(0).at(0));
     for (const auto &rectF : rects)
@@ -3533,7 +3533,7 @@ void tst_QGraphicsScene::task160653_selectionChanged()
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QTest::mouseClick(
                 view.viewport(), Qt::LeftButton, {}, view.mapFromScene(scene.items().first()->scenePos()));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 void tst_QGraphicsScene::task250680_childClip()
@@ -4623,17 +4623,17 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     QGraphicsScene scene;
     QSignalSpy spy(&scene, &QGraphicsScene::focusItemChanged);
     QVERIFY(spy.isValid());
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     scene.setFocus();
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     QEvent activateEvent(QEvent::WindowActivate);
     QCoreApplication::sendEvent(&scene, &activateEvent);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     QGraphicsRectItem *topLevelItem1 = new QGraphicsRectItem;
     topLevelItem1->setFlag(QGraphicsItem::ItemIsFocusable);
     scene.addItem(topLevelItem1);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     QVERIFY(!topLevelItem1->hasFocus());
 
     QGraphicsRectItem *topLevelItem2 = new QGraphicsRectItem;
@@ -4641,7 +4641,7 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     topLevelItem2->setFocus();
     QVERIFY(!topLevelItem2->hasFocus());
     scene.addItem(topLevelItem2);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QList<QVariant> arguments = spy.takeFirst();
     QCOMPARE(arguments.size(), 3);
     QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), topLevelItem2);
@@ -4650,7 +4650,7 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     QVERIFY(topLevelItem2->hasFocus());
 
     scene.clearFocus();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.size(), 3);
     QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), nullptr);
@@ -4658,7 +4658,7 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     QCOMPARE(qvariant_cast<Qt::FocusReason>(arguments.at(2)), Qt::OtherFocusReason);
 
     scene.setFocus(Qt::MenuBarFocusReason);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.size(), 3);
     QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), topLevelItem2);
@@ -4687,16 +4687,16 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     QEvent deactivateEvent(QEvent::WindowDeactivate);
     QCoreApplication::sendEvent(&scene, &deactivateEvent);
     QEXPECT_FAIL("", "QTBUG-28346", Continue);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCoreApplication::sendEvent(&scene, &activateEvent);
     QEXPECT_FAIL("", "QTBUG-28346", Continue);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     QGraphicsRectItem *panel1 = new QGraphicsRectItem;
     panel1->setFlags(QGraphicsItem::ItemIsPanel | QGraphicsItem::ItemIsFocusable);
     panel1->setFocus();
     scene.addItem(panel1);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     arguments = spy.takeFirst();
     QCOMPARE(arguments.size(), 3);
     QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), panel1);
@@ -4706,11 +4706,11 @@ void tst_QGraphicsScene::focusItemChangedSignal()
     QGraphicsRectItem *panel2 = new QGraphicsRectItem;
     panel2->setFlags(QGraphicsItem::ItemIsPanel | QGraphicsItem::ItemIsFocusable);
     scene.addItem(panel2);
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
 
     for (int i = 0; i < 3; ++i) {
         scene.setActivePanel(panel2);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         arguments = spy.takeFirst();
         QCOMPARE(arguments.size(), 3);
         QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), panel2);
@@ -4718,7 +4718,7 @@ void tst_QGraphicsScene::focusItemChangedSignal()
         QCOMPARE(qvariant_cast<Qt::FocusReason>(arguments.at(2)), Qt::ActiveWindowFocusReason);
 
         scene.setActivePanel(panel1);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         arguments = spy.takeFirst();
         QCOMPARE(arguments.size(), 3);
         QCOMPARE(qvariant_cast<QGraphicsItem *>(arguments.at(0)), panel1);
@@ -4865,23 +4865,23 @@ void tst_QGraphicsScene::clearSelection()
     scene.addItem(regularRect);
     scene.addItem(selectedRect);
 
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 
     QCOMPARE(scene.selectedItems().size(), 2);
     scene.clearSelection();
     QVERIFY(!regularRect->isSelected());
     QVERIFY(selectedRect->isSelected());
     QCOMPARE(scene.selectedItems().size(), 1);
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 
     delete regularRect;
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 
     scene.clearSelection();
-    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.size(), 3);
 
     delete selectedRect;
-    QCOMPARE(spy.count(), 4);
+    QCOMPARE(spy.size(), 4);
 }
 
 void tst_QGraphicsScene::taskQTBUG_15977_renderWithDeviceCoordinateCache()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index d7803ba6f8..d5807c1958 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -667,16 +667,16 @@ void tst_QGraphicsView::openGLViewport()
 
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
-    QTRY_VERIFY(spy1.count() > 0);
-    QTRY_VERIFY(spy2.count() >= spy1.count());
+    QTRY_VERIFY(spy1.size() > 0);
+    QTRY_VERIFY(spy2.size() >= spy1.size());
     spy1.clear();
     spy2.clear();
 
     // Now test for resize (QTBUG-52419). This is special when the viewport is
     // a QOpenGLWidget since the underlying FBO must also be maintained.
     view.resize(300, 300);
-    QTRY_VERIFY(spy1.count() > 0);
-    QTRY_VERIFY(spy2.count() >= spy1.count());
+    QTRY_VERIFY(spy1.size() > 0);
+    QTRY_VERIFY(spy2.size() >= spy1.size());
     // There is no sane way to check if the framebuffer contents got updated
     // (grabFramebuffer is no good for the viewport case as that does not go
     // through paintGL). So skip the actual verification.
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 372ebf9038..a6fcdb9b9a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -950,9 +950,9 @@ void tst_QGraphicsWidget::geometry()
     widget.setPos(pos);
     widget.resize(size);
     if (!size.isNull() && !pos.isNull())
-        QCOMPARE(spy.count(), 2);
+        QCOMPARE(spy.size(), 2);
     if (!size.isNull() && pos.isNull())
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
     QCOMPARE(widget.geometry(), QRectF(pos, size));
 }
 
@@ -963,10 +963,10 @@ void tst_QGraphicsWidget::geometryChanged()
     QCOMPARE(w.geometry(), QRectF(0, 0, 200, 200));
     QSignalSpy spy(&w, SIGNAL(geometryChanged()));
     w.setGeometry(0, 0, 100, 100);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(w.geometry(), QRectF(0, 0, 100, 100));
     w.setPos(10, 10);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
     QCOMPARE(w.geometry(), QRectF(10, 10, 100, 100));
 
 }
@@ -978,10 +978,10 @@ void tst_QGraphicsWidget::width()
     QSignalSpy spy(&w, SIGNAL(widthChanged()));
     w.setProperty("width", qreal(50));
     QCOMPARE(w.property("width").toReal(), qreal(50));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     //calling old school setGeometry should work too
     w.setGeometry(0, 0, 200, 200);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QGraphicsWidget::height()
@@ -991,10 +991,10 @@ void tst_QGraphicsWidget::height()
     QSignalSpy spy(&w, SIGNAL(heightChanged()));
     w.setProperty("height", qreal(50));
     QCOMPARE(w.property("height").toReal(), qreal(50));
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     //calling old school setGeometry should work too
     w.setGeometry(0, 0, 200, 200);
-    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.size(), 2);
 }
 
 void tst_QGraphicsWidget::getContentsMargins_data()
@@ -1145,7 +1145,7 @@ void tst_QGraphicsWidget::layout()
         QCOMPARE(item->parentWidget(), (QGraphicsWidget *)&widget);
         QVERIFY(item->geometry() != QRectF(0, 0, -1, -1));
     }
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     // don't crash
     widget.setLayout(0);
 }
@@ -2731,11 +2731,11 @@ void tst_QGraphicsWidget::task250119_shortcutContext()
 
     w_signal.setFocus();
     QTest::keyPress(&view, Qt::Key_B);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     w_signal.clearFocus();
     QTest::keyPress(&view, Qt::Key_B);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 
     scene.removeItem(&w_signal);
 }