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

This is a the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.

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

112 files changed, 709 insertions, 709 deletions

diff --git a/src/animation/backend/animationutils.cpp b/src/animation/backend/animationutils.cpp
index d75ef02d8..d8138145e 100644
--- a/src/animation/backend/animationutils.cpp
+++ b/src/animation/backend/animationutils.cpp
@@ -172,7 +172,7 @@ ComponentIndices channelComponentsToIndicesHelper(const Channel &channel,
             continue;
         }
 
-        char channelSuffix = componentName.at(componentName.length() - 1).toLatin1();
+        char channelSuffix = componentName.at(componentName.size() - 1).toLatin1();
         channelSuffixes.push_back(channelSuffix);
     }
 
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index 3359d49e2..f26da3bea 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -48,7 +48,7 @@ QStringList dumpSG(const Qt3DCore::QNode *n, int level = 0)
     const auto *entity = qobject_cast<const Qt3DCore::QEntity *>(n);
     if (entity != nullptr) {
         QString res = dumpNode(entity);
-        reply += res.rightJustified(res.length() + level * 2, QLatin1Char(' '));
+        reply += res.rightJustified(res.size() + level * 2, QLatin1Char(' '));
         level++;
     }
 
diff --git a/src/extras/defaults/qspritesheet.cpp b/src/extras/defaults/qspritesheet.cpp
index 1e5291f66..89f54687f 100644
--- a/src/extras/defaults/qspritesheet.cpp
+++ b/src/extras/defaults/qspritesheet.cpp
@@ -20,7 +20,7 @@ QSpriteSheetPrivate::QSpriteSheetPrivate()
 
 int QSpriteSheetPrivate::maxIndex() const
 {
-    return m_sprites.count() - 1;
+    return m_sprites.size() - 1;
 }
 
 void QSpriteSheetPrivate::updateSizes()
diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp
index 3476f6cee..db910466e 100644
--- a/src/logic/manager.cpp
+++ b/src/logic/manager.cpp
@@ -54,7 +54,7 @@ void Manager::removeHandler(Qt3DCore::QNodeId id)
 
 bool Manager::hasFrameActions() const
 {
-    return m_logicHandlers.count() > 0;
+    return m_logicHandlers.size() > 0;
 }
 
 // Called from Job postFrame (main thread)
diff --git a/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h b/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
index 14be5093b..37d999eec 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
+++ b/src/plugins/renderers/opengl/graphicshelpers/qgraphicsutils_p.h
@@ -326,7 +326,7 @@ public:
         QVariantList vList = v.toList();
         // Handles list of QVariant: usually arrays of float
         if (!vList.isEmpty()) {
-            for (int i = 0; i < vList.length() && uint(i) * offset < uint(uniformValuesArray.size()); i++) {
+            for (int i = 0; i < vList.size() && uint(i) * offset < uint(uniformValuesArray.size()); i++) {
                 const char *subBuffer = QGraphicsUtils::bytesFromVariant<T>(vList.at(i));
                 memcpy(data + i * offset, subBuffer, offset);
             }
diff --git a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
index 3985093ff..27697142f 100644
--- a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
+++ b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
@@ -270,7 +270,7 @@ void CommandExecuter::performAsynchronousCommandExecution(const std::vector<Rend
 QVariant CommandExecuter::executeCommand(const QStringList &args)
 {
     // Note: The replies will be deleted by the AspectCommandDebugger
-    if (args.length() > 0 &&
+    if (args.size() > 0 &&
             (args.first() == QLatin1String("glinfo") ||
              args.first() == QLatin1String("rendercommands"))) {
         auto reply = new Qt3DCore::Debug::AsynchronousCommandReply(args.first());
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index 3017eb085..8fda1dd5a 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -1434,7 +1434,7 @@ void GLTFImporter::processJSONAsset(const QJsonObject &json)
     const QString version = json.value(KEY_VERSION).toString();
     if (!version.isEmpty()) {
         const QStringList verTokens = version.split('.');
-        if (verTokens.length() >= 2) {
+        if (verTokens.size() >= 2) {
             m_majorVersion = verTokens[0].toInt();
             m_minorVersion = verTokens[1].toInt();
         }
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index 93f4fac6e..3a00411e0 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -61,7 +61,7 @@ QQmlListProperty<QComponent> Quick3DEntity::componentList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DEntity *self = static_cast<Quick3DEntity *>(list->object);
-        return self->parentEntity()->components().count();
+        return self->parentEntity()->components().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DEntity *self = static_cast<Quick3DEntity *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp
index 160f80324..63cd0d8b9 100644
--- a/src/quick3d/quick3d/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<Qt3DCore::QAttribute> Quick3DGeometry::attributeList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-        return geometry->parentGeometry()->attributes().count();
+        return geometry->parentGeometry()->attributes().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp
index 2ff990744..baa79dd56 100644
--- a/src/quick3d/quick3d/items/quick3djoint.cpp
+++ b/src/quick3d/quick3d/items/quick3djoint.cpp
@@ -33,7 +33,7 @@ QQmlListProperty<QJoint> Quick3DJoint::childJoints()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DJoint *jointExtension = qobject_cast<Quick3DJoint *>(list->object);
-        return jointExtension->parentJoint()->childJoints().count();
+        return jointExtension->parentJoint()->childJoints().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DJoint *jointExtension = qobject_cast<Quick3DJoint *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index 27617caca..969874136 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -47,7 +47,7 @@ QQmlListProperty<QObject> Quick3DNode::data()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
-        return self->parentNode()->children().count();
+        return self->parentNode()->children().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
@@ -87,7 +87,7 @@ QQmlListProperty<QNode> Quick3DNode::childNodes()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
-        return self->parentNode()->children().count();
+        return self->parentNode()->children().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index d2752bcf4..1f9e5d068 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -85,10 +85,10 @@ void Quick3DNodeInstantiatorPrivate::clear()
     Q_Q(Quick3DNodeInstantiator);
     if (!m_instanceModel)
         return;
-    if (!m_objects.count())
+    if (!m_objects.size())
         return;
 
-    for (int i = 0; i < m_objects.count(); i++) {
+    for (int i = 0; i < m_objects.size(); i++) {
         emit q->objectRemoved(i, m_objects[i]);
         m_instanceModel->release(m_objects[i]);
     }
@@ -148,7 +148,7 @@ void Quick3DNodeInstantiatorPrivate::_q_createdItem(int idx, QObject *item)
         m_instanceModel->release(o);
     m_objects.replace(idx, item);
 
-    if (m_objects.count() == 1)
+    if (m_objects.size() == 1)
         emit q->objectChanged();
     emit q->objectAdded(idx, item);
 }
@@ -171,8 +171,8 @@ void Quick3DNodeInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &change
     QHash<int, QList<QPointer<QObject>>> moved;
     const auto removes = changeSet.removes();
     for (const QQmlChangeSet::Change &remove : removes) {
-        int index = qMin(remove.index, m_objects.count());
-        int count = qMin(remove.index + remove.count, m_objects.count()) - index;
+        int index = qMin(remove.index, m_objects.size());
+        int count = qMin(remove.index + remove.count, m_objects.size()) - index;
         if (remove.isMove()) {
             moved.insert(remove.moveId, m_objects.mid(index, count));
             m_objects.erase(
@@ -193,12 +193,12 @@ void Quick3DNodeInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &change
 
     const auto inserts = changeSet.inserts();
     for (const QQmlChangeSet::Change &insert : inserts) {
-        int index = qMin(insert.index, m_objects.count());
+        int index = qMin(insert.index, m_objects.size());
         if (insert.isMove()) {
             QList<QPointer<QObject>> movedObjects = moved.value(insert.moveId);
             m_objects = m_objects.mid(0, index) + movedObjects + m_objects.mid(index);
         } else for (int i = 0; i < insert.count; ++i) {
-            if (insert.index <= m_objects.count())
+            if (insert.index <= m_objects.size())
                 m_objects.insert(insert.index, insert.count, nullptr);
             for (int i = 0; i < insert.count; ++i) {
                 int modelIndex = index + i;
@@ -335,7 +335,7 @@ void Quick3DNodeInstantiator::setAsync(bool newVal)
 int Quick3DNodeInstantiator::count() const
 {
     Q_D(const Quick3DNodeInstantiator);
-    return d->m_objects.count();
+    return d->m_objects.size();
 }
 
 /*!
@@ -467,7 +467,7 @@ void Quick3DNodeInstantiator::setModel(const QVariant &v)
 QObject *Quick3DNodeInstantiator::object() const
 {
     Q_D(const Quick3DNodeInstantiator);
-    if (d->m_objects.count())
+    if (d->m_objects.size())
         return d->m_objects[0];
     return 0;
 }
@@ -480,7 +480,7 @@ QObject *Quick3DNodeInstantiator::object() const
 QObject *Quick3DNodeInstantiator::objectAt(int index) const
 {
     Q_D(const Quick3DNodeInstantiator);
-    if (index >= 0 && index < d->m_objects.count())
+    if (index >= 0 && index < d->m_objects.size())
         return d->m_objects[index];
     return 0;
 }
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
index 243df49ed..89f47c8ae 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
@@ -19,10 +19,10 @@ QVariant createValueTypeFromNumberString(const QString &s)
 
     QVarLengthArray<float, NumParams> parameters;
     bool ok = true;
-    for (qsizetype prev = 0, next = s.indexOf(u','), length = s.length(); ok && prev < length;) {
+    for (qsizetype prev = 0, next = s.indexOf(u','), length = s.size(); ok && prev < length;) {
         parameters.append(s.mid(prev, next - prev).toFloat(&ok));
         prev = next + 1;
-        next = (parameters.length() == NumParams - 1) ? length : s.indexOf(u',', prev);
+        next = (parameters.size() == NumParams - 1) ? length : s.indexOf(u',', prev);
     }
 
     if (!ok)
diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
index 25c2ebda3..cae8c4971 100644
--- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
+++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
@@ -30,7 +30,7 @@ QQmlListProperty<QAnimationGroup> QQuick3DAnimationController::animationGroups()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         QQuick3DAnimationController *controller = qobject_cast<QQuick3DAnimationController *>(list->object);
         if (controller)
-            return controller->parentAnimationController()->animationGroupList().count();
+            return controller->parentAnimationController()->animationGroupList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
index 0008823c1..383cdada4 100644
--- a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
+++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
@@ -32,7 +32,7 @@ QQmlListProperty<Qt3DAnimation::QAbstractAnimation> QQuick3DAnimationGroup::anim
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object);
         if (animationGroup)
-            return animationGroup->parentAnimationGroup()->animationList().count();
+            return animationGroup->parentAnimationGroup()->animationList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
index 562fdf571..2d3542eaf 100644
--- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
@@ -32,7 +32,7 @@ QQmlListProperty<Qt3DCore::QTransform> QQuick3DKeyframeAnimation::keyframes()
         QQuick3DKeyframeAnimation *keyframeAnimation
             = qobject_cast<QQuick3DKeyframeAnimation *>(list->object);
         if (keyframeAnimation)
-            return keyframeAnimation->parentKeyframeAnimation()->keyframeList().count();
+            return keyframeAnimation->parentKeyframeAnimation()->keyframeList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
index 5bafd7662..409e210d9 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
@@ -30,7 +30,7 @@ QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DMorphingAnimation::morphTa
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object);
         if (animation)
-            return animation->parentMorphingAnimation()->morphTargetList().count();
+            return animation->parentMorphingAnimation()->morphTargetList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
index b30e5ae6a..5abc874a5 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
@@ -30,7 +30,7 @@ QQmlListProperty<Qt3DCore::QAttribute> QQuick3DMorphTarget::attributes()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object);
         if (target)
-            return target->parentMorphTarget()->attributeList().count();
+            return target->parentMorphTarget()->attributeList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
index 353e8ba29..c9f264ea0 100644
--- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
@@ -32,7 +32,7 @@ QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DVertexBlendAnimation::morp
         QQuick3DVertexBlendAnimation *animation
             = qobject_cast<QQuick3DVertexBlendAnimation *>(list->object);
         if (animation)
-            return animation->parentVertexBlendAnimation()->morphTargetList().count();
+            return animation->parentVertexBlendAnimation()->morphTargetList().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
index 8ece6d359..facdf9a01 100644
--- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
+++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
@@ -34,7 +34,7 @@ QQmlListProperty<Qt3DExtras::QSpriteSheetItem> Quick3DSpriteSheet::sprites()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DSpriteSheet *spritesheet = qobject_cast<Quick3DSpriteSheet *>(list->object);
-        return spritesheet->parentSpriteSheet()->sprites().count();
+        return spritesheet->parentSpriteSheet()->sprites().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DSpriteSheet *spritesheet = qobject_cast<Quick3DSpriteSheet *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp
index 059c687e0..bb6e89e69 100644
--- a/src/quick3d/quick3dinput/items/quick3daction.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daction.cpp
@@ -28,7 +28,7 @@ QQmlListProperty<QAbstractActionInput> Quick3DAction::qmlActionInputs()
     };
     auto countFunction = [](QQmlListProperty<QAbstractActionInput> *list) -> qt_size_type {
         Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
-        return action->parentAction()->inputs().count();
+        return action->parentAction()->inputs().size();
     };
     auto atFunction = [](QQmlListProperty<QAbstractActionInput> *list, qt_size_type index) -> QAbstractActionInput * {
         Quick3DAction *action = qobject_cast<Quick3DAction *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp
index 24c530067..9b830e440 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<QAbstractAxisInput> Quick3DAxis::qmlAxisInputs()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
-        return axis->parentAxis()->inputs().count();
+        return axis->parentAxis()->inputs().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DAxis *axis = qobject_cast<Quick3DAxis *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
index 95d12ea06..7cadb5799 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<QAbstractActionInput> Quick3DInputChord::qmlActionInputs()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DInputChord *action = qobject_cast<Quick3DInputChord *>(list->object);
-        return action->parentChord()->chords().count();
+        return action->parentChord()->chords().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DInputChord *action = qobject_cast<Quick3DInputChord *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
index 6a1b0b49a..9e09d7eeb 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<QAbstractActionInput> Quick3DInputSequence::qmlActionInputs()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DInputSequence *action = qobject_cast<Quick3DInputSequence *>(list->object);
-        return action->parentSequence()->sequences().count();
+        return action->parentSequence()->sequences().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DInputSequence *action = qobject_cast<Quick3DInputSequence *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
index d3ad51c1e..5097ef024 100644
--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<QAxis> Quick3DLogicalDevice::qmlAxes()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object);
-        return device->parentLogicalDevice()->axes().count();
+        return device->parentLogicalDevice()->axes().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object);
@@ -60,7 +60,7 @@ QQmlListProperty<QAction> Quick3DLogicalDevice::qmlActions()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object);
-        return device->parentLogicalDevice()->actions().count();
+        return device->parentLogicalDevice()->actions().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DLogicalDevice *device = qobject_cast<Quick3DLogicalDevice *>(list->object);
diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
index cef96c07b..ef5c46042 100644
--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
@@ -29,7 +29,7 @@ QQmlListProperty<QAxisSetting> Quick3DPhysicalDevice::axisSettings()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DPhysicalDevice *device = qobject_cast<Quick3DPhysicalDevice *>(list->object);
-        return device->parentPhysicalDevice()->axisSettings().count();
+        return device->parentPhysicalDevice()->axisSettings().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DPhysicalDevice *device = qobject_cast<Quick3DPhysicalDevice *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index 97e0fd83a..a38dddb47 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -33,7 +33,7 @@ QQmlListProperty<QTechnique> Quick3DEffect::techniqueList()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DEffect *eff = qobject_cast<Quick3DEffect*>(list->object);
         if (eff)
-            return eff->parentEffect()->techniques().count();
+            return eff->parentEffect()->techniques().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
@@ -72,7 +72,7 @@ QQmlListProperty<QParameter> Quick3DEffect::parameterList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object);
-        return qobject_cast<QEffect *>(effect->parentEffect())->parameters().count();
+        return qobject_cast<QEffect *>(effect->parentEffect())->parameters().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DEffect *effect = qobject_cast<Quick3DEffect *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 93f0b55bb..2ad597294 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -36,7 +36,7 @@ QQmlListProperty<QLayer> Quick3DLayerFilter::qmlLayers()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
         if (filter)
-            return filter->parentFilter()->layers().count();
+            return filter->parentFilter()->layers().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index c46b85e18..9f8fed800 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -37,7 +37,7 @@ QQmlListProperty<QParameter> Quick3DMaterial::qmlParameters()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DMaterial *mat = qobject_cast<Quick3DMaterial *>(list->object);
         if (mat)
-            return mat->parentMaterial()->parameters().count();
+            return mat->parentMaterial()->parameters().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 1016200d4..5bc50673a 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -30,7 +30,7 @@ QQmlListProperty<QFilterKey> Quick3DRenderPass::filterKeyList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-        return rPass->parentRenderPass()->filterKeys().count();
+        return rPass->parentRenderPass()->filterKeys().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
@@ -61,7 +61,7 @@ QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-        return rPass->parentRenderPass()->renderStates().count();
+        return rPass->parentRenderPass()->renderStates().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
@@ -92,7 +92,7 @@ QQmlListProperty<QParameter> Quick3DRenderPass::parameterList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-        return rPass->parentRenderPass()->parameters().count();
+        return rPass->parentRenderPass()->parameters().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 9f46aaaa7..7c6249298 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -32,7 +32,7 @@ QQmlListProperty<QFilterKey> Quick3DRenderPassFilter::includeList()
     auto countFunction = [](QQmlListProperty<QFilterKey> *list) -> qt_size_type {
         auto self = qobject_cast<Quick3DRenderPassFilter *>(list->object);
         if (self)
-            return self->parentRenderPassFilter()->matchAny().count();
+            return self->parentRenderPassFilter()->matchAny().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<QFilterKey> *list, qt_size_type index) -> QFilterKey * {
@@ -70,7 +70,7 @@ QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList()
     auto countFunction = [](QQmlListProperty<QParameter> *list) -> qt_size_type {
         auto self = qobject_cast<Quick3DRenderPassFilter *>(list->object);
         if (self)
-            return self->parentRenderPassFilter()->parameters().count();
+            return self->parentRenderPassFilter()->parameters().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<QParameter> *list, qt_size_type index) -> QParameter * {
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index 0488ecf3b..9ede43513 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -31,7 +31,7 @@ QQmlListProperty<QRenderTargetOutput> Quick3DRenderTargetOutput::qmlAttachments(
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
         if (rT)
-            return rT->parentRenderTarget()->outputs().count();
+            return rT->parentRenderTarget()->outputs().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 0d3faa348..76f1948b4 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -40,7 +40,7 @@ QQmlListProperty<QShaderData> Quick3DShaderDataArray::valuesList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DShaderDataArray *self = static_cast<Quick3DShaderDataArray *>(list->object);
-        return static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.count();
+        return static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DShaderDataArray *self = static_cast<Quick3DShaderDataArray *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index 1861832a9..0c37c529f 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -33,7 +33,7 @@ QQmlListProperty<QRenderState> Quick3DStateSet::renderStateList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object);
-        return stateSet->parentStateSet()->renderStates().count();
+        return stateSet->parentStateSet()->renderStates().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DStateSet *stateSet = qobject_cast<Quick3DStateSet *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 8bf720a25..d7ebfc9fe 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -67,7 +67,7 @@ QQmlListProperty<QParameter> Quick3DTechnique::parameterList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
-        return technique->parentTechnique()->parameters().count();
+        return technique->parentTechnique()->parameters().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 51473018e..37ac4045f 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -69,7 +69,7 @@ QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList()
     };
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
-        return techniqueFilter->parentTechniqueFilter()->parameters().count();
+        return techniqueFilter->parentTechniqueFilter()->parameters().size();
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
         Quick3DTechniqueFilter *techniqueFilter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index eb18920b0..2929ff4d4 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -33,7 +33,7 @@ QQmlListProperty<QAbstractTextureImage> Quick3DTextureExtension::textureImages()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         Quick3DTextureExtension *self = qobject_cast<Quick3DTextureExtension *>(list->object);
         if (self)
-            return self->parentTexture()->textureImages().count();
+            return self->parentTexture()->textureImages().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
index 3dda10d58..e4b76765d 100644
--- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
@@ -32,7 +32,7 @@ QQmlListProperty<Qt3DCore::QEntity> QQuick3DScene2D::entities()
     auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
         QQuick3DScene2D *scene2d = qobject_cast<QQuick3DScene2D *>(list->object);
         if (scene2d)
-            return scene2d->parentScene2D()->entities().count();
+            return scene2d->parentScene2D()->entities().size();
         return 0;
     };
     auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 0ffd97540..5319abb5f 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -47,7 +47,7 @@ QStringList dumpFG(const Qt3DCore::QNode *n, int level = 0)
     const Qt3DRender::QFrameGraphNode *fgNode = qobject_cast<const Qt3DRender::QFrameGraphNode *>(n);
     if (fgNode) {
         QString res = dumpNode(fgNode);
-        reply += res.rightJustified(res.length() + level * 2, QLatin1Char(' '));
+        reply += res.rightJustified(res.size() + level * 2, QLatin1Char(' '));
     }
 
     const auto children = n->childNodes();
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index ead7def06..759a8f686 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -219,7 +219,7 @@ QStringList dumpSGFilterState(Qt3DRender::Render::TechniqueManager *manager,
                     res += QLatin1String(" [ %1 ]").arg(filters.join(QLatin1String(" ")));
             }
         }
-        reply += res.rightJustified(res.length() + level * 2, QLatin1Char(' '));
+        reply += res.rightJustified(res.size() + level * 2, QLatin1Char(' '));
         level++;
     }
 
diff --git a/src/render/jobs/uniformblockbuilder.cpp b/src/render/jobs/uniformblockbuilder.cpp
index 78904c2de..132c31d9e 100644
--- a/src/render/jobs/uniformblockbuilder.cpp
+++ b/src/render/jobs/uniformblockbuilder.cpp
@@ -88,7 +88,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(Shader
                                                                           const QString &qmlPropertyName)
 {
     QString fullBlockName;
-    fullBlockName.reserve(blockName.length() + 1 + qmlPropertyName.length());
+    fullBlockName.reserve(blockName.size() + 1 + qmlPropertyName.size());
     fullBlockName.append(blockName);
     if (!qmlPropertyName.isEmpty()) {
         fullBlockName.append(QLatin1String("."));
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index d14fc5e64..7d5db965f 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -897,7 +897,7 @@ QByteArray QShaderProgramPrivate::deincludify(const QByteArray &contents, const
 {
     QByteArrayList lines = contents.split('\n');
     const QByteArray includeDirective = QByteArrayLiteral("#pragma include");
-    for (int i = 0; i < lines.count(); ++i) {
+    for (int i = 0; i < lines.size(); ++i) {
         const auto line = lines[i].simplified();
         if (line.startsWith(includeDirective)) {
             const QString includePartialPath = QString::fromUtf8(line.mid(includeDirective.size() + 1));
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 66042166a..365c1929d 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -85,7 +85,7 @@ void ShaderData::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
             if (propertyValue.userType() == QMetaType::QVariantList) {
                 isArray = true;
                 QVariantList list = propertyValue.value<QVariantList>();
-                if (list.count() > 0 && list.at(0).userType() == qNodeIdTypeId)
+                if (list.size() > 0 && list.at(0).userType() == qNodeIdTypeId)
                     isNode = true;
             }
 
@@ -150,7 +150,7 @@ void ShaderData::generatePropertyValuesForBlock(const QString &fullBlockName)
             propertyName += QLatin1String("[0]");
 
         QString fullPropertyName;
-        fullPropertyName.reserve(fullBlockName.length() + 1 + it.key().length());
+        fullPropertyName.reserve(fullBlockName.size() + 1 + it.key().size());
         fullPropertyName.append(fullBlockName);
         fullPropertyName.append(QLatin1String("."));
         fullPropertyName.append(propertyName);
diff --git a/src/render/picking/qraycasterhit.cpp b/src/render/picking/qraycasterhit.cpp
index 6d56ab31a..6dfa0e303 100644
--- a/src/render/picking/qraycasterhit.cpp
+++ b/src/render/picking/qraycasterhit.cpp
@@ -194,7 +194,7 @@ QString QRayCasterHit::toString()
     QString res;
     if (!d->m_entity)
         return QLatin1String("{}");
-    if (d->m_entity->objectName().length())
+    if (d->m_entity->objectName().size())
         res = d->m_entity->objectName();
     else
         res = QLatin1String("Entity");
diff --git a/src/render/shadergraph/qshadergenerator.cpp b/src/render/shadergraph/qshadergenerator.cpp
index 3bb650c3c..393d06222 100644
--- a/src/render/shadergraph/qshadergenerator.cpp
+++ b/src/render/shadergraph/qshadergenerator.cpp
@@ -632,7 +632,7 @@ QByteArray QShaderGenerator::createShaderCode(const QStringList &enabledLayers)
 
             if (replacementIt != variableReplacements.cend()) {
                 line.replace(begin, placeholderLength, replacementIt->variable);
-                begin += replacementIt->variable.length();
+                begin += replacementIt->variable.size();
             } else {
                 begin = end;
             }
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index 6854057a2..f00a0c23c 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1040,7 +1040,7 @@ QTextureDataPtr QTextureFromSourceGenerator::operator ()()
         QT_PREPEND_NAMESPACE(QBuffer) buffer(&m_sourceData);
         if (buffer.open(QIODevice::ReadOnly)) {
             QString suffix = m_url.toString();
-            suffix = suffix.right(suffix.length() - suffix.lastIndexOf(QLatin1Char('.')));
+            suffix = suffix.right(suffix.size() - suffix.lastIndexOf(QLatin1Char('.')));
 
             QStringList ext(suffix);
 
@@ -1052,7 +1052,7 @@ QTextureDataPtr QTextureFromSourceGenerator::operator ()()
 
             for (const QString &s: qAsConst(ext)) {
                 textureData = TextureLoadingHelper::loadTextureData(&buffer, s, true, m_mirrored);
-                if (textureData && textureData->data().length() > 0)
+                if (textureData && textureData->data().size() > 0)
                     break;
             }
         }
@@ -1064,7 +1064,7 @@ QTextureDataPtr QTextureFromSourceGenerator::operator ()()
     if (textureData && m_format != QAbstractTexture::NoFormat && m_format != QAbstractTexture::Automatic)
         textureData->setFormat(static_cast<QOpenGLTexture::TextureFormat>(m_format));
 
-    if (textureData && textureData->data().length() > 0) {
+    if (textureData && textureData->data().size() > 0) {
         generatedData->setTarget(static_cast<QAbstractTexture::Target>(textureData->target()));
         generatedData->setFormat(static_cast<QAbstractTexture::TextureFormat>(textureData->format()));
         generatedData->setWidth(textureData->width());
diff --git a/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp
index 49766f2da..22a0e9a27 100644
--- a/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp
+++ b/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp
@@ -54,7 +54,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractAnimation.animationName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -62,7 +62,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractAnimation.animationName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -73,7 +73,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractAnimation.position(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -81,7 +81,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractAnimation.position(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
index 23ee27a7d..f31d65ce3 100644
--- a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
+++ b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
@@ -45,7 +45,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(addBlend.additiveFactor(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -53,7 +53,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(addBlend.additiveFactor(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -65,7 +65,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(addBlend.baseClip(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -73,7 +73,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(addBlend.baseClip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -85,7 +85,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(addBlend.additiveClip(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -93,7 +93,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(addBlend.additiveClip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp b/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp
index 8f9b07e8b..963268c34 100644
--- a/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp
+++ b/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp
@@ -39,7 +39,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(clip.source(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -47,7 +47,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(clip.source(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
index 65ff89d22..38f4ba651 100644
--- a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
+++ b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.activeAnimationGroup(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -49,7 +49,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.activeAnimationGroup(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -60,7 +60,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.position(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -68,7 +68,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.position(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -79,7 +79,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.positionScale(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -87,7 +87,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.positionScale(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -98,7 +98,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.positionOffset(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -106,7 +106,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.positionOffset(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -118,7 +118,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.entity(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -126,7 +126,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.entity(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -137,7 +137,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.recursive(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -145,7 +145,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationController.recursive(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp
index 0ce62ead7..f4664c181 100644
--- a/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp
+++ b/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp
@@ -36,7 +36,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationGroup.name(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -44,7 +44,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationGroup.name(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -55,7 +55,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationGroup.position(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -63,7 +63,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animationGroup.position(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
index 7576a127c..94fe5dee2 100644
--- a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
+++ b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.blendTree(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -57,7 +57,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.blendTree(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -68,7 +68,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.channelMapper(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -76,7 +76,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.channelMapper(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -87,7 +87,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.isRunning(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -95,7 +95,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.isRunning(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -107,7 +107,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.loopCount(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -115,7 +115,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.loopCount(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -127,7 +127,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.normalizedTime(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -135,7 +135,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.normalizedTime(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -148,7 +148,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(blendedClipAnimator.normalizedTime(), oldValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // WHEN
             spy.clear();
@@ -156,7 +156,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(blendedClipAnimator.normalizedTime(), oldValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp
index 6827d5281..e66c0241d 100644
--- a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp
+++ b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp
@@ -44,7 +44,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mapping.channelName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -52,7 +52,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mapping.channelName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
diff --git a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
index 52eed5eab..6bedadb41 100644
--- a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
+++ b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp
@@ -88,7 +88,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mapping.channelName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -96,7 +96,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mapping.channelName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -109,7 +109,7 @@ private Q_SLOTS:
             QVERIFY(spy.isValid());
             QCOMPARE(mapping.target(), newValue);
             QCOMPARE(newValue->parent(), &mapping);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mapping.target(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -129,7 +129,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mapping.property(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -137,7 +137,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mapping.property(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
index 6cd306074..d10456908 100644
--- a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
+++ b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp
@@ -53,7 +53,7 @@ private Q_SLOTS:
             QVERIFY(spy.isValid());
             QCOMPARE(animator.clip(), newValue);
             QCOMPARE(newValue->parent(), &animator);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -61,7 +61,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animator.clip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -74,7 +74,7 @@ private Q_SLOTS:
             QVERIFY(spy.isValid());
             QCOMPARE(animator.channelMapper(), newValue);
             QCOMPARE(newValue->parent(), &animator);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -82,7 +82,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animator.channelMapper(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -95,7 +95,7 @@ private Q_SLOTS:
             QVERIFY(spy.isValid());
             QCOMPARE(animator.clock(), clock);
             QCOMPARE(clock->parent(), &animator);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -103,7 +103,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animator.clock(), clock);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -115,7 +115,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(animator.loopCount(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -123,7 +123,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(animator.loopCount(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp b/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp
index 314acb9fb..8cadb1df8 100644
--- a/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp
+++ b/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(clipBlendNode.clip(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -51,7 +51,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(clipBlendNode.clip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qclock/tst_qclock.cpp b/tests/auto/animation/qclock/tst_qclock.cpp
index 8270b6ff3..da21bba67 100644
--- a/tests/auto/animation/qclock/tst_qclock.cpp
+++ b/tests/auto/animation/qclock/tst_qclock.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
         // THEN
         QVERIFY(spy.isValid());
         QCOMPARE(clock.playbackRate(), newValue);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         // WHEN
         spy.clear();
@@ -49,7 +49,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(clock.playbackRate(), newValue);
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
     }
 
     void checkPropertyUpdate()
diff --git a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
index 00c16f784..b9f4ad565 100644
--- a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
+++ b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
@@ -45,7 +45,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -53,7 +53,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -64,7 +64,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.easing(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -72,7 +72,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.easing(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -83,7 +83,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -91,7 +91,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -104,7 +104,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.startMode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -112,7 +112,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.startMode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -125,7 +125,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.endMode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -133,7 +133,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(keyframeAnimation.endMode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp b/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp
index 34e953983..d8c67f8f1 100644
--- a/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp
+++ b/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp
@@ -45,7 +45,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(lerpBlend.blendFactor(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -53,7 +53,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(lerpBlend.blendFactor(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -65,7 +65,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(lerpBlend.startClip(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -73,7 +73,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(lerpBlend.startClip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -85,7 +85,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(lerpBlend.endClip(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -93,7 +93,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(lerpBlend.endClip(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
index 2aac299f6..8cb22b145 100644
--- a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
+++ b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp
@@ -59,7 +59,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -67,7 +67,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -78,7 +78,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -86,7 +86,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -98,7 +98,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.method(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -106,7 +106,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.method(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.easing(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -125,7 +125,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(morphingAnimation.easing(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp b/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp
index 9443259bc..76512f47a 100644
--- a/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp
+++ b/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mapping.skeleton(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -51,7 +51,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mapping.skeleton(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
index c1dc20ed9..f77a972ae 100644
--- a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
+++ b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp
@@ -38,7 +38,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(vertexBlendAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -46,7 +46,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(vertexBlendAnimation.target(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -57,7 +57,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(vertexBlendAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -65,7 +65,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(vertexBlendAnimation.targetName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 2601e7365..7c5868e11 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -591,7 +591,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneExplicitParenting()
     // THEN
     QVERIFY(child->parent() == node.data());
     QVERIFY(child->parentNode() == node.data());
-    QCOMPARE(node->children().count(), 1);
+    QCOMPARE(node->children().size(), 1);
 
     // Events are only sent when a scene is set on the root node
     QCOMPARE(arbiter.dirtyNodes().size(), 0);
@@ -614,7 +614,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneImplicitParenting()
     // THEN
     QVERIFY(child->parent() == node.data());
     QVERIFY(child->parentNode() == node.data());
-    QCOMPARE(node->children().count(), 1);
+    QCOMPARE(node->children().size(), 1);
 
     // Events are only sent when a scene is set on the root node
     QCOMPARE(arbiter.dirtyNodes().size(), 0);
@@ -646,7 +646,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeNoScene()
     }
 
     // THEN
-    QCOMPARE(node->children().count(), 10);
+    QCOMPARE(node->children().size(), 10);
 
     // Events are only sent when a scene is set on the root node
     QCOMPARE(arbiter.dirtyNodes().size(), 0);
@@ -680,7 +680,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneExplicitParenting()
     QVERIFY(child->parent() == node.data());
     QVERIFY(child->parentNode() == node.data());
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // Child Added
-    QCOMPARE(node->children().count(), 1);
+    QCOMPARE(node->children().size(), 1);
     QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != nullptr);
 }
 
@@ -707,7 +707,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneImplicitParenting()
     QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != nullptr);
 
     QCOMPARE(arbiter.dirtyNodes().size(), 1);
-    QCOMPARE(node->children().count(), 1);
+    QCOMPARE(node->children().size(), 1);
 }
 
 void tst_Nodes::appendMultipleChildNodesToNodeScene()
@@ -742,7 +742,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene()
         QVERIFY(Qt3DCore::QNodePrivate::get(child)->scene() == Qt3DCore::QNodePrivate::get(node.data())->m_scene);
     }
     // THEN
-    QCOMPARE(node->children().count(), 10);
+    QCOMPARE(node->children().size(), 10);
 
     // WHEN
     QCoreApplication::processEvents();
@@ -839,7 +839,7 @@ void tst_Nodes::checkParentChangeFromExistingBackendParentToNewlyCreatedParent()
 
     // Due to the way we create root, it has a backend
     QVERIFY(Qt3DCore::QNodePrivate::get(root.data())->m_hasBackendNode == true);
-    QCOMPARE(aspect->events.count(), 2);
+    QCOMPARE(aspect->events.size(), 2);
     QCOMPARE(aspect->events[0].type, TestAspect::Creation);
     QCOMPARE(aspect->events[0].nodeId, child->id());
     QCOMPARE(aspect->events[1].type, TestAspect::Creation);
@@ -932,7 +932,7 @@ void tst_Nodes::checkBackendNodesCreatedFromTopDown()
     child1->setNodeProperty(child2);
 
     // THEN - we should have no events because the new nodes have no backend yet
-    QCOMPARE(arbiter.dirtyNodes().count(), 0);
+    QCOMPARE(arbiter.dirtyNodes().size(), 0);
 
     // WHEN - create the backend nodes
     QCoreApplication::processEvents();
@@ -1018,7 +1018,7 @@ void tst_Nodes::removingSingleChildNodeFromNode()
     arbiter.clear();
 
     // THEN
-    QVERIFY(root->children().count() == 1);
+    QVERIFY(root->children().size() == 1);
     QVERIFY(child->parentNode() == root.data());
 
     // WHEN
@@ -1026,7 +1026,7 @@ void tst_Nodes::removingSingleChildNodeFromNode()
 
     // THEN
     QVERIFY(child->parent() == nullptr);
-    QVERIFY(root->children().count() == 0);
+    QVERIFY(root->children().size() == 0);
 
     QCOMPARE(arbiter.dirtyNodes().size(), 1);
 }
@@ -1048,7 +1048,7 @@ void tst_Nodes::checkAllBackendCreationDoneInSingleFrame()
     // THEN
     // Due to the way we create root, it has a backend
     QVERIFY(Qt3DCore::QNodePrivate::get(root.data())->m_hasBackendNode == true);
-    QCOMPARE(aspect->events.count(), 1);
+    QCOMPARE(aspect->events.size(), 1);
     QCOMPARE(aspect->events[0].type, TestAspect::Creation);
     QCOMPARE(aspect->events[0].nodeId, root->id());
 
@@ -1072,7 +1072,7 @@ void tst_Nodes::checkAllBackendCreationDoneInSingleFrame()
     engine.processFrame();
 
     // THEN - both children have their backend nodes actually created.
-    QCOMPARE(aspect->events.count(), 2);
+    QCOMPARE(aspect->events.size(), 2);
     QCOMPARE(aspect->events[0].type, TestAspect::Creation);
     QCOMPARE(aspect->events[0].nodeId, child2->id());
     QCOMPARE(aspect->events[1].type, TestAspect::Creation);
@@ -1102,7 +1102,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
     QCoreApplication::processEvents();
 
     // THEN
-    QCOMPARE(root->children().count(), 10);
+    QCOMPARE(root->children().size(), 10);
     QCOMPARE(arbiter.dirtyNodes().size(), 1);
 
     // WHEN
@@ -1111,7 +1111,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
     qDeleteAll(cl);
 
     // THEN
-    QVERIFY(root->children().count() == 0);
+    QVERIFY(root->children().size() == 0);
     QCOMPARE(arbiter.dirtyNodes().size(), 0);   // since all nodes are deleted, there's no backend to notify
 }
 
@@ -1179,8 +1179,8 @@ void tst_Nodes::checkConstructionSetParentMix()
 
     // THEN
     QCoreApplication::processEvents();
-    QCOMPARE(root->children().count(), 1);
-    QCOMPARE(subTreeRoot->children().count(), 100);
+    QCOMPARE(root->children().size(), 1);
+    QCOMPARE(subTreeRoot->children().size(), 100);
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added (subTree to root)
 
     // Ensure first event is subTreeRoot
@@ -1244,7 +1244,7 @@ void tst_Nodes::checkConstructionWithParent()
 
     // THEN we should get one child added change
     QCoreApplication::processEvents();
-    QCOMPARE(root->children().count(), 1);
+    QCOMPARE(root->children().size(), 1);
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added change
     QCOMPARE(arbiter.dirtyNodes().front(), root.data());
 }
@@ -1276,8 +1276,8 @@ void tst_Nodes::checkConstructionWithNonRootParent()
     // - and one property change event,
     // in that order.
     QCoreApplication::processEvents();
-    QCOMPARE(root->children().count(), 1);
-    QCOMPARE(parent->children().count(), 1);
+    QCOMPARE(root->children().size(), 1);
+    QCOMPARE(parent->children().size(), 1);
 
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added changes
     QCOMPARE(arbiter.dirtyNodes().front(), root.data());
@@ -1305,7 +1305,7 @@ void tst_Nodes::checkConstructionAsListElement()
     // and one property change event, in that order.
     QCoreApplication::processEvents();
 
-    QCOMPARE(root->children().count(), 1);
+    QCOMPARE(root->children().size(), 1);
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 property change
 }
 
@@ -1338,8 +1338,8 @@ void tst_Nodes::checkSceneIsSetOnConstructionWithParent()
         // When cmp is full created, it will also send the creation change for its child entity
     }
     QCoreApplication::processEvents();
-    QCOMPARE(root->children().count(), 1);
-    QCOMPARE(subTreeRoot->children().count(), 5);
+    QCOMPARE(root->children().size(), 1);
+    QCOMPARE(subTreeRoot->children().size(), 5);
     QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added (subTree to root)
 
     arbiter.clear();
@@ -1401,7 +1401,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithoutScene()
 
         // THEN
         QVERIFY(entity->parentNode() == nullptr);
-        QVERIFY(entity->children().count() == 0);
+        QVERIFY(entity->children().size() == 0);
         QVERIFY(entity->components().empty());
         QVERIFY(comp->parentNode() == nullptr);
 
@@ -1409,7 +1409,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithoutScene()
         entity->addComponent(comp);
 
         // THEN
-        QVERIFY(entity->components().count() == 1);
+        QVERIFY(entity->components().size() == 1);
         QVERIFY(entity->components().first() == comp);
         QVERIFY(comp->parentNode() == entity.data());
         QCOMPARE(arbiter.dirtyNodes().size(), 1);
@@ -1440,10 +1440,10 @@ void tst_Nodes::appendingParentlessComponentToNonRootEntity()
 
         // THEN
         QVERIFY(root->parentNode() == nullptr);
-        QVERIFY(root->children().count() == 1);
+        QVERIFY(root->children().size() == 1);
         QVERIFY(root->components().empty());
         QVERIFY(entity->parentNode() == root.data());
-        QVERIFY(entity->children().count() == 0);
+        QVERIFY(entity->children().size() == 0);
         QVERIFY(entity->components().empty());
         QVERIFY(comp->parentNode() == nullptr);
 
@@ -1452,7 +1452,7 @@ void tst_Nodes::appendingParentlessComponentToNonRootEntity()
         QCoreApplication::processEvents();
 
         // THEN
-        QVERIFY(entity->components().count() == 1);
+        QVERIFY(entity->components().size() == 1);
         QVERIFY(entity->components().first() == comp);
         QVERIFY(comp->parentNode() == entity.data());
 
@@ -1482,7 +1482,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithScene()
 
         // THEN
         QVERIFY(entity->parentNode() == nullptr);
-        QVERIFY(entity->children().count() == 0);
+        QVERIFY(entity->children().size() == 0);
         QVERIFY(entity->components().empty());
         QVERIFY(comp->parentNode() == nullptr);
 
@@ -1491,7 +1491,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithScene()
         QCoreApplication::processEvents();
 
         // THEN
-        QVERIFY(entity->components().count() == 1);
+        QVERIFY(entity->components().size() == 1);
         QVERIFY(entity->components().first() == comp);
         QVERIFY(comp->parentNode() == entity.data());
 
@@ -1513,7 +1513,7 @@ void tst_Nodes::appendingComponentToEntity()
 
         // THEN
         QVERIFY(entity->parentNode() == nullptr);
-        QVERIFY(entity->children().count() == 1);
+        QVERIFY(entity->children().size() == 1);
         QVERIFY(entity->components().empty());
         QVERIFY(comp->parentNode() == entity.data());
 
@@ -1521,7 +1521,7 @@ void tst_Nodes::appendingComponentToEntity()
         entity->addComponent(comp);
 
         // THEN
-        QVERIFY(entity->components().count() == 1);
+        QVERIFY(entity->components().size() == 1);
         QVERIFY(entity->components().first() == comp);
         QVERIFY(comp->parentNode() == entity.data());
         QCOMPARE(arbiter.dirtyNodes().size(), 1);
@@ -1543,8 +1543,8 @@ void tst_Nodes::removingComponentFromEntity()
         entity->addComponent(comp);
 
         // THEN
-        QVERIFY(entity->components().count() == 1);
-        QCOMPARE(entity->children().count(), 1);
+        QVERIFY(entity->components().size() == 1);
+        QCOMPARE(entity->children().size(), 1);
         QVERIFY(comp->parent() == entity.data());
 
         // WHEN
@@ -1552,9 +1552,9 @@ void tst_Nodes::removingComponentFromEntity()
         entity->removeComponent(comp);
 
         // THEN
-        QVERIFY(entity->components().count() == 0);
+        QVERIFY(entity->components().size() == 0);
         QVERIFY(comp->parent() == entity.data());
-        QVERIFY(entity->children().count() == 1);
+        QVERIFY(entity->children().size() == 1);
         QCOMPARE(arbiter.dirtyNodes().size(), 1);
     }
 }
@@ -1623,7 +1623,7 @@ void tst_Nodes::checkPropertyChanges()
         // THEN
         QVERIFY(spy.isValid());
         QCOMPARE(node.parentNode(), newValue);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         // WHEN
         spy.clear();
@@ -1631,7 +1631,7 @@ void tst_Nodes::checkPropertyChanges()
 
         // THEN
         QCOMPARE(node.parentNode(), newValue);
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
     }
     {
         // WHEN
@@ -1642,7 +1642,7 @@ void tst_Nodes::checkPropertyChanges()
         // THEN
         QVERIFY(spy.isValid());
         QCOMPARE(node.isEnabled(), newValue);
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
 
         // WHEN
         spy.clear();
@@ -1650,7 +1650,7 @@ void tst_Nodes::checkPropertyChanges()
 
         // THEN
         QCOMPARE(node.isEnabled(), newValue);
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
     }
 }
 
diff --git a/tests/auto/core/qjoint/tst_qjoint.cpp b/tests/auto/core/qjoint/tst_qjoint.cpp
index b816f7785..6c632dfab 100644
--- a/tests/auto/core/qjoint/tst_qjoint.cpp
+++ b/tests/auto/core/qjoint/tst_qjoint.cpp
@@ -45,7 +45,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(joint.scale(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -53,7 +53,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(joint.scale(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -66,7 +66,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(joint.rotation(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -74,7 +74,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(joint.rotation(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -87,7 +87,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(joint.translation(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -95,7 +95,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(joint.translation(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -109,7 +109,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(joint.inverseBindMatrix(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(joint.inverseBindMatrix(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -134,8 +134,8 @@ private Q_SLOTS:
             QVERIFY(spyEuler.isValid());
             QCOMPARE(joint.rotationX(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 1);
-            QCOMPARE(spyEuler.count(), 1);
+            QCOMPARE(spy.size(), 1);
+            QCOMPARE(spyEuler.size(), 1);
 
             // WHEN
             spy.clear();
@@ -145,8 +145,8 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(joint.rotationX(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 0);
-            QCOMPARE(spyEuler.count(), 0);
+            QCOMPARE(spy.size(), 0);
+            QCOMPARE(spyEuler.size(), 0);
 
             joint.setRotationX(0.0f);
         }
@@ -165,8 +165,8 @@ private Q_SLOTS:
             QVERIFY(spyEuler.isValid());
             QCOMPARE(joint.rotationY(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 1);
-            QCOMPARE(spyEuler.count(), 1);
+            QCOMPARE(spy.size(), 1);
+            QCOMPARE(spyEuler.size(), 1);
 
             // WHEN
             spy.clear();
@@ -176,8 +176,8 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(joint.rotationY(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 0);
-            QCOMPARE(spyEuler.count(), 0);
+            QCOMPARE(spy.size(), 0);
+            QCOMPARE(spyEuler.size(), 0);
 
             joint.setRotationY(0.0f);
         }
@@ -196,8 +196,8 @@ private Q_SLOTS:
             QVERIFY(spyEuler.isValid());
             QCOMPARE(joint.rotationZ(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 1);
-            QCOMPARE(spyEuler.count(), 1);
+            QCOMPARE(spy.size(), 1);
+            QCOMPARE(spyEuler.size(), 1);
 
             // WHEN
             spy.clear();
@@ -207,8 +207,8 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(joint.rotationZ(), newValue);
             QCOMPARE(joint.rotation(), newValueAsQuaternion);
-            QCOMPARE(spy.count(), 0);
-            QCOMPARE(spyEuler.count(), 0);
+            QCOMPARE(spy.size(), 0);
+            QCOMPARE(spyEuler.size(), 0);
 
             joint.setRotationZ(0.0f);
         }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 4fd49ddbb..1dc512205 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -248,7 +248,7 @@ void tst_QScene::addEntityForComponent()
     // THEN
     for (int i = 0; i < 10; i++) {
         const QList<Qt3DCore::QNodeId> ids = scene->entitiesForComponent(components.at(i)->id());
-        QCOMPARE(ids.count(), 10);
+        QCOMPARE(ids.size(), 10);
     }
 }
 
@@ -283,7 +283,7 @@ void tst_QScene::removeEntityForComponent()
         Qt3DCore::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->removeComponent(components.at(j));
-            QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).count(), 10 - (i + 1));
+            QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).size(), 10 - (i + 1));
         }
     }
 }
diff --git a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp
index 82bdc29f9..9324de2f4 100644
--- a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp
+++ b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp
@@ -42,7 +42,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(skeleton.source(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -50,7 +50,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(skeleton.source(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -62,7 +62,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(skeleton.isCreateJointsEnabled(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -70,7 +70,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(skeleton.isCreateJointsEnabled(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp
index 3a0d08528..c7a5aa594 100644
--- a/tests/auto/core/qtransform/tst_qtransform.cpp
+++ b/tests/auto/core/qtransform/tst_qtransform.cpp
@@ -272,7 +272,7 @@ private Q_SLOTS:
 
 
         // THEN
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(t.worldMatrix(), newValue);
 
@@ -281,7 +281,7 @@ private Q_SLOTS:
         dT->setWorldMatrix(newValue);
 
         // THEN
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(t.worldMatrix(), newValue);
     }
diff --git a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp
index 57800053d..aec1e9315 100644
--- a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp
+++ b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp
@@ -42,7 +42,7 @@ void tst_qtext2dentity::checkChangeArbiter()
     auto rootEntity = view.engine()->aspectEngine()->rootEntity();
     QVERIFY(rootEntity != nullptr);
     auto atlases = lookupNodeByClassName(rootEntity.data(), "Qt3DExtras::QTextureAtlas");
-    QVERIFY(atlases.length() == 1);
+    QVERIFY(atlases.size() == 1);
     auto atlas = atlases[0];
     QTRY_VERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter);
 }
diff --git a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
index efb24df81..11f65e6ac 100644
--- a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
+++ b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp
@@ -129,7 +129,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(backendAxisAccumulator.value(), 0.0f);
-        QCOMPARE(arbiter.dirtyNodes().count(), 0);
+        QCOMPARE(arbiter.dirtyNodes().size(), 0);
     }
 
     void checkIntegration_data()
diff --git a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
index 642372c96..26ffa2921 100644
--- a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
+++ b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
@@ -144,7 +144,7 @@ private Q_SLOTS:
             job.run();
 
             // THEN -> PhysicalDeviceWrapper::setDevice should not have been called
-            QCOMPARE(arbiter.dirtyNodes().count(), 0);
+            QCOMPARE(arbiter.dirtyNodes().size(), 0);
         }
     }
 
diff --git a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
index 93ca142c0..c91dc8e6b 100644
--- a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
+++ b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp
@@ -60,7 +60,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mouseDevice.sensitivity(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -68,7 +68,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mouseDevice.sensitivity(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -79,7 +79,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mouseDevice.updateAxesContinuously(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -87,7 +87,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mouseDevice.updateAxesContinuously(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
index 4c9f50b8b..344175d80 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h
@@ -38,7 +38,7 @@ public:
 
     int rowCount(const QModelIndex &) const override
     {
-        return items.count();
+        return items.size();
     }
 
     QHash<int, QByteArray> roleNames() const override
@@ -73,7 +73,7 @@ public:
     QVariant data (const QModelIndex & index, int role) const override
     {
         int row = index.row();
-        if ((row<0) || (row>=items.count()))
+        if ((row<0) || (row>=items.size()))
             return int(QMetaType::UnknownType);
 
         switch (role) {
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
index 0e686bff6..4dad12049 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
@@ -96,7 +96,7 @@ void tst_quick3dnodeinstantiator::createNested()
     QVERIFY(root != 0);
 
     auto instantiators = root->findChildren<Quick3DNodeInstantiator*>();
-    QCOMPARE(instantiators.count(), 4);
+    QCOMPARE(instantiators.size(), 4);
 
     const auto outerInstantiator = instantiators.takeFirst();
     QCOMPARE(outerInstantiator->isActive(), true);
@@ -151,19 +151,19 @@ void tst_quick3dnodeinstantiator::activeProperty()
     QCOMPARE(instantiator->count(), 0);
     QVERIFY(instantiator->delegate()->isReady());
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 0);
-    QCOMPARE(objectSpy.count(), 0);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 0);
+    QCOMPARE(objectSpy.size(), 0);
+    QCOMPARE(modelSpy.size(), 0);
 
     instantiator->setActive(true);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 1);
 
-    QCOMPARE(activeSpy.count(), 1);
-    QCOMPARE(countSpy.count(), 1);
-    QCOMPARE(objectSpy.count(), 1);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 1);
+    QCOMPARE(countSpy.size(), 1);
+    QCOMPARE(objectSpy.size(), 1);
+    QCOMPARE(modelSpy.size(), 0);
 
     QObject *object = instantiator->object();
     QVERIFY(object);
@@ -186,18 +186,18 @@ void tst_quick3dnodeinstantiator::intModelChange()
     QSignalSpy modelSpy(instantiator, SIGNAL(modelChanged()));
     QCOMPARE(instantiator->count(), 10);
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 0);
-    QCOMPARE(objectSpy.count(), 0);
-    QCOMPARE(modelSpy.count(), 0);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 0);
+    QCOMPARE(objectSpy.size(), 0);
+    QCOMPARE(modelSpy.size(), 0);
 
     instantiator->setModel(QVariant(2));
     QCOMPARE(instantiator->count(), 2);
 
-    QCOMPARE(activeSpy.count(), 0);
-    QCOMPARE(countSpy.count(), 1);
-    QCOMPARE(objectSpy.count(), 2);
-    QCOMPARE(modelSpy.count(), 1);
+    QCOMPARE(activeSpy.size(), 0);
+    QCOMPARE(countSpy.size(), 1);
+    QCOMPARE(objectSpy.size(), 2);
+    QCOMPARE(modelSpy.size(), 1);
 
     for (int i = 0; i < 2; i++) {
         QObject *object = instantiator->objectAt(i);
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 4873a5441..1b18923db 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -212,8 +212,8 @@ private slots:
         QVERIFY(backendB->parent() == backendA);
         QVERIFY(backendC->parent() == backendB);
 
-        QCOMPARE(backendA->childrenHandles().count(), 1);
-        QCOMPARE(backendB->childrenHandles().count(), 1);
+        QCOMPARE(backendA->childrenHandles().size(), 1);
+        QCOMPARE(backendB->childrenHandles().size(), 1);
         QVERIFY(backendC->childrenHandles().isEmpty());
 
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::AllDirty);
@@ -244,7 +244,7 @@ private slots:
         QVERIFY(backendB->parent() == nullptr);
         QVERIFY(backendC->parent() == backendA);
 
-        QCOMPARE(backendA->childrenHandles().count(), 1);
+        QCOMPARE(backendA->childrenHandles().size(), 1);
         QVERIFY(!backendA->childrenHandles().contains(backendB->handle()));
         QVERIFY(backendB->childrenHandles().isEmpty());
         QVERIFY(backendC->childrenHandles().isEmpty());
@@ -281,7 +281,7 @@ private slots:
         QVERIFY(backendB->parent() == backendA);
         QVERIFY(backendC->parent() == backendA);
 
-        QCOMPARE(backendA->childrenHandles().count(), 2);
+        QCOMPARE(backendA->childrenHandles().size(), 2);
         QVERIFY(backendB->childrenHandles().isEmpty());
         QVERIFY(backendC->childrenHandles().isEmpty());
 
@@ -297,7 +297,7 @@ private slots:
         QVERIFY(backendB->parent() == backendA);
         QVERIFY(backendC->parent() == nullptr);
 
-        QCOMPARE(backendA->childrenHandles().count(), 1);
+        QCOMPARE(backendA->childrenHandles().size(), 1);
         QVERIFY(!backendA->childrenHandles().contains(backendC->handle()));
         QVERIFY(backendB->childrenHandles().isEmpty());
         QVERIFY(backendC->childrenHandles().isEmpty());
@@ -558,8 +558,8 @@ private slots:
         const auto r2 = v2.apply(backendA);
 
         // THEN
-        QCOMPARE(r1.count(), 3);
-        QCOMPARE(r2.count(), 0);
+        QCOMPARE(r1.size(), 3);
+        QCOMPARE(r2.size(), 0);
     }
 
 private:
diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
index 56e614c21..d99627de1 100644
--- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
+++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
@@ -114,9 +114,9 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(child->parentId(), parentId);
         QCOMPARE(child->parent(), parent1);
-        QCOMPARE(parent1->childrenIds().count(), 1);
+        QCOMPARE(parent1->childrenIds().size(), 1);
         QCOMPARE(parent1->childrenIds().first(), childId);
-        QCOMPARE(parent1->children().count(), parent1->childrenIds().count());
+        QCOMPARE(parent1->children().size(), parent1->childrenIds().size());
         QCOMPARE(parent1->children().first(), child);
 
         // WHEN
@@ -125,8 +125,8 @@ private Q_SLOTS:
         // THEN
         QVERIFY(child->parentId().isNull());
         QVERIFY(child->parent() == nullptr);
-        QCOMPARE(parent1->childrenIds().count(), 0);
-        QCOMPARE(parent1->children().count(), parent1->childrenIds().count());
+        QCOMPARE(parent1->childrenIds().size(), 0);
+        QCOMPARE(parent1->children().size(), parent1->childrenIds().size());
     }
 
     void checkSetParent()
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index 5b447010a..1e4d933fa 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -54,7 +54,7 @@ private Q_SLOTS:
         // THEN
         QCOMPARE(renderGeometry.peerId(), geometry.id());
         QCOMPARE(renderGeometry.isDirty(), true);
-        QCOMPARE(renderGeometry.attributes().count(), 4);
+        QCOMPARE(renderGeometry.attributes().size(), 4);
         QCOMPARE(renderGeometry.boundingPositionAttribute(), attr1.id());
 
         Qt3DCore::QNodeIdVector attribs = Qt3DCore::qIdsForNodes(geometry.attributes());
@@ -134,7 +134,7 @@ private Q_SLOTS:
         renderGeometry.syncFromFrontEnd(&geometry, false);
 
         // THEN
-        QCOMPARE(renderGeometry.attributes().count(), 1);
+        QCOMPARE(renderGeometry.attributes().size(), 1);
         QVERIFY(renderGeometry.isDirty());
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty);
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
@@ -147,7 +147,7 @@ private Q_SLOTS:
         renderGeometry.syncFromFrontEnd(&geometry, false);
 
         // THEN
-        QCOMPARE(renderGeometry.attributes().count(), 0);
+        QCOMPARE(renderGeometry.attributes().size(), 0);
         QVERIFY(renderGeometry.isDirty());
         QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty);
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
@@ -179,7 +179,7 @@ private Q_SLOTS:
         renderGeometry.updateExtent(QVector3D(-1.0f, -1.0f, -1.0f), QVector3D(1.0f, 1.0f, 1.0f));
 
         // THEN
-        QCOMPARE(arbiter.dirtyNodes().count(), 0);
+        QCOMPARE(arbiter.dirtyNodes().size(), 0);
 
         QCOMPARE(renderGeometry.min(), QVector3D(-1.0f, -1.0f, -1.0f));
         QCOMPARE(renderGeometry.max(), QVector3D(1.0f, 1.0f, 1.0f));
diff --git a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp
index 3ae977fe8..a012e62a7 100644
--- a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp
+++ b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp
@@ -66,7 +66,7 @@ void tst_geometryloaders::testOBJLoader()
     if (!geometry)
         return;
 
-    QCOMPARE(geometry->attributes().count(), 3);
+    QCOMPARE(geometry->attributes().size(), 3);
     for (QAttribute *attr : geometry->attributes()) {
         switch (attr->attributeType()) {
         case QAttribute::IndexAttribute:
@@ -108,7 +108,7 @@ void tst_geometryloaders::testPLYLoader()
     if (!geometry)
         return;
 
-    QCOMPARE(geometry->attributes().count(), 3);
+    QCOMPARE(geometry->attributes().size(), 3);
     for (QAttribute *attr : geometry->attributes()) {
         switch (attr->attributeType()) {
         case QAttribute::IndexAttribute:
@@ -150,7 +150,7 @@ void tst_geometryloaders::testSTLLoader()
     if (!geometry)
         return;
 
-    QCOMPARE(geometry->attributes().count(), 3);
+    QCOMPARE(geometry->attributes().size(), 3);
     for (QAttribute *attr : geometry->attributes()) {
         QCOMPARE(attr->count(), 36u);
     }
@@ -182,7 +182,7 @@ void tst_geometryloaders::testGLTFLoader()
     if (!geometry)
         return;
 
-    QCOMPARE(geometry->attributes().count(), 3);
+    QCOMPARE(geometry->attributes().size(), 3);
     for (QAttribute *attr : geometry->attributes()) {
         switch (attr->attributeType()) {
         case QAttribute::IndexAttribute:
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index de8cbcbdb..33c6cb487 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -95,7 +95,7 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer()
     // THEN
     QVERIFY(backend.isEnabled() == frontendMaterial->isEnabled());
     QCOMPARE(backend.effect(), frontendMaterial->effect() ? frontendMaterial->effect()->id() : QNodeId());
-    QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count());
+    QCOMPARE(backend.parameters().size(), frontendMaterial->parameters().size());
     QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::MaterialDirty);
 
     int c = 0;
@@ -122,7 +122,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange()
     backend.syncFromFrontEnd(&material, false);
 
     // THEN
-    QCOMPARE(backend.parameters().count(), 1);
+    QCOMPARE(backend.parameters().size(), 1);
     QCOMPARE(backend.parameters().first(), parameter->id());
     QVERIFY(renderer.dirtyBits() != 0);
 
diff --git a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp
index e08e4b2c7..ea97071b1 100644
--- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp
@@ -437,7 +437,7 @@ void tst_RenderViewUtils::topLevelScalarValue()
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock"));
 
     // THEN
-    QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1);
+    QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1);
 
     // WHEN
     Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin();
@@ -511,7 +511,7 @@ void tst_RenderViewUtils::topLevelTextureValue()
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock"));
 
     // THEN
-    QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1);
+    QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1);
 
     // WHEN
     Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin();
@@ -552,7 +552,7 @@ void tst_RenderViewUtils::topLevelArrayValue()
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock"));
 
     // THEN
-    QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1);
+    QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1);
 
     // WHEN
     Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin();
@@ -622,7 +622,7 @@ void tst_RenderViewUtils::nestedShaderDataValue()
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendArrayShaderData, QStringLiteral("MyBlock"));
 
     // THEN
-    QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3);
+    QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3);
 
     // WHEN
     auto it = blockBuilder.activeUniformNamesToValue.cbegin();
@@ -696,7 +696,7 @@ void tst_RenderViewUtils::topLevelStructValue()
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, blockName);
 
     // THEN
-    QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.count()),
+    QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.size()),
              shaderData->buildUniformMapNameIds(blockName).size());
 
     // WHEN
@@ -746,7 +746,7 @@ void tst_RenderViewUtils::topLevelDynamicProperties()
     // build name-value map
     blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock"));
     // THEN
-    QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3);
+    QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3);
 
     QCOMPARE(blockBuilder.activeUniformNamesToValue.value(Qt3DRender::Render::StringToInt::lookupId("MyBlock.scalar")),
              shaderData->property("scalar"));
diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
index 2927489b0..e8e217c6e 100644
--- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
+++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp
@@ -831,10 +831,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker1->isPressed());
             QVERIFY(picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
         }
 
         {
@@ -849,10 +849,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker1->isPressed());
             QVERIFY(picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
         }
 
         {
@@ -867,10 +867,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseButtonReleasedSpy.count(), /*backAndFrontPicking ? 2 :*/ 1);
-            QCOMPARE(mouseClickedSpy.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseButtonReleasedSpy.size(), /*backAndFrontPicking ? 2 :*/ 1);
+            QCOMPARE(mouseClickedSpy.size(), 1);
         }
 
         mouseButtonPressedSpy.clear();
@@ -893,9 +893,9 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 1);
         }
     }
 
@@ -959,9 +959,9 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker1->isPressed());
             QVERIFY(picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
         }
 
         {
@@ -976,9 +976,9 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy.size(), 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 1);
         }
 
         mouseButtonPressedSpy.clear();
@@ -997,9 +997,9 @@ private Q_SLOTS:
             // THEN -> Should have received nothing
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 0);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), 0);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
         }
     }
 
@@ -1070,8 +1070,8 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseEntered.count(), 1);
-            QCOMPARE(mouseExited.count(), 0);
+            QCOMPARE(mouseEntered.size(), 1);
+            QCOMPARE(mouseExited.size(), 0);
         }
 
         {
@@ -1086,8 +1086,8 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseEntered.count(), 1);
-            QCOMPARE(mouseExited.count(), 1);
+            QCOMPARE(mouseEntered.size(), 1);
+            QCOMPARE(mouseExited.size(), 1);
         }
 
         mouseEntered.clear();
@@ -1108,8 +1108,8 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker1->isPressed());
             QVERIFY(!picker1->isPressed());
-            QCOMPARE(mouseEntered.count(), 1);
-            QCOMPARE(mouseExited.count(), 1);
+            QCOMPARE(mouseEntered.size(), 1);
+            QCOMPARE(mouseExited.size(), 1);
         }
     }
 
@@ -1186,10 +1186,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker->isPressed());
             QVERIFY(picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
         }
 
         mouseButtonPressedSpy.clear();
@@ -1206,10 +1206,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker->isPressed());
             QVERIFY(picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 0);
-            QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), 0);
+            QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
         }
 
         mouseMovedSpy.clear();
@@ -1226,10 +1226,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker->isPressed());
             QVERIFY(!picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 0);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 1);
-            QCOMPARE(mouseClickedSpy.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy.size(), 0);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 1);
+            QCOMPARE(mouseClickedSpy.size(), 1);
         }
 
         // WHEN -> Release outside of object
@@ -1251,10 +1251,10 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker->isPressed());
             QVERIFY(!picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 1);
-            QCOMPARE(mouseClickedSpy.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 1);
+            QCOMPARE(mouseClickedSpy.size(), 1);
         }
     }
 
@@ -1361,12 +1361,12 @@ private Q_SLOTS:
             QVERIFY(backendPicker1->isPressed());
             QVERIFY(picker1->isPressed());
 
-            QCOMPARE(mouseButtonPressedSpy1.count(), backAndFrontPicking ? 2 : 1);
-            QCOMPARE(mouseMovedSpy1.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy1.count(), 0);
-            QCOMPARE(mouseClickedSpy1.count(), 0);
-            QCOMPARE(mouseEntered1.count(), 0);
-            QCOMPARE(mouseExited1.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), backAndFrontPicking ? 2 : 1);
+            QCOMPARE(mouseMovedSpy1.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy1.size(), 0);
+            QCOMPARE(mouseClickedSpy1.size(), 0);
+            QCOMPARE(mouseEntered1.size(), 0);
+            QCOMPARE(mouseExited1.size(), 0);
         }
 
         {
@@ -1382,20 +1382,20 @@ private Q_SLOTS:
             if (pickResultMode != Qt3DRender::QPickingSettings::AllPicks) {
                 QVERIFY(backendPicker1->isPressed());
                 QVERIFY(picker1->isPressed());
-                QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-                QCOMPARE(mouseMovedSpy1.count(), 1);
-                QCOMPARE(mouseButtonReleasedSpy1.count(), 0);
-                QCOMPARE(mouseClickedSpy1.count(), 0);
-                QCOMPARE(mouseEntered1.count(), 0);
-                QCOMPARE(mouseExited1.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+                QCOMPARE(mouseMovedSpy1.size(), 1);
+                QCOMPARE(mouseButtonReleasedSpy1.size(), 0);
+                QCOMPARE(mouseClickedSpy1.size(), 0);
+                QCOMPARE(mouseEntered1.size(), 0);
+                QCOMPARE(mouseExited1.size(), 0);
             } else {
                 QVERIFY(!picker2->isPressed());
-                QCOMPARE(mouseButtonPressedSpy2.count(), 0);
-                QCOMPARE(mouseMovedSpy2.count(), backAndFrontPicking ? 2 : 1);
-                QCOMPARE(mouseButtonReleasedSpy2.count(), 0);
-                QCOMPARE(mouseClickedSpy2.count(), 0);
-                QCOMPARE(mouseEntered2.count(), 1);
-                QCOMPARE(mouseExited2.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy2.size(), 0);
+                QCOMPARE(mouseMovedSpy2.size(), backAndFrontPicking ? 2 : 1);
+                QCOMPARE(mouseButtonReleasedSpy2.size(), 0);
+                QCOMPARE(mouseClickedSpy2.size(), 0);
+                QCOMPARE(mouseEntered2.size(), 1);
+                QCOMPARE(mouseExited2.size(), 0);
             }
         }
     }
@@ -1460,12 +1460,12 @@ private Q_SLOTS:
         QVERIFY(!earlyReturn);
         QVERIFY(backendPicker->isPressed());
         QVERIFY(picker->isPressed());
-        QCOMPARE(mouseButtonPressedSpy.count(), 1);
-        QCOMPARE(mouseMovedSpy.count(), 0);
-        QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-        QCOMPARE(mouseClickedSpy.count(), 0);
-        QCOMPARE(mouseEntered.count(), 0);
-        QCOMPARE(mouseExited.count(), 0);
+        QCOMPARE(mouseButtonPressedSpy.size(), 1);
+        QCOMPARE(mouseMovedSpy.size(), 0);
+        QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+        QCOMPARE(mouseClickedSpy.size(), 0);
+        QCOMPARE(mouseEntered.size(), 0);
+        QCOMPARE(mouseExited.size(), 0);
     }
 
     void checkPickerAndViewports()
@@ -1529,12 +1529,12 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker->isPressed());
             QVERIFY(picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
-            QCOMPARE(mouseEntered.count(), 0);
-            QCOMPARE(mouseExited.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
+            QCOMPARE(mouseEntered.size(), 0);
+            QCOMPARE(mouseExited.size(), 0);
         }
 
         // WHEN reset -> Presset on object in vp2
@@ -1552,12 +1552,12 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(!backendPicker->isPressed());
             QVERIFY(picker->isPressed());
-            QCOMPARE(mouseButtonPressedSpy.count(), 1);
-            QCOMPARE(mouseMovedSpy.count(), 0);
-            QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-            QCOMPARE(mouseClickedSpy.count(), 0);
-            QCOMPARE(mouseEntered.count(), 0);
-            QCOMPARE(mouseExited.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy.size(), 1);
+            QCOMPARE(mouseMovedSpy.size(), 0);
+            QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+            QCOMPARE(mouseClickedSpy.size(), 0);
+            QCOMPARE(mouseEntered.size(), 0);
+            QCOMPARE(mouseExited.size(), 0);
         }
     }
 
@@ -1616,8 +1616,8 @@ private Q_SLOTS:
             QVERIFY(picker1->isPressed());
             QVERIFY(!backendPicker2->isPressed());
             QVERIFY(!picker2->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 0);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(150., 300.), QPointF(150., 300.),
                                      Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -1636,8 +1636,8 @@ private Q_SLOTS:
             QVERIFY(!earlyReturn);
             QVERIFY(backendPicker2->isPressed());
             QVERIFY(picker2->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
         }
     }
 
@@ -1729,11 +1729,11 @@ private Q_SLOTS:
             QVERIFY(!picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(200.0, 300.0), QPointF(200.0, 300.0),
                                       Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -1761,11 +1761,11 @@ private Q_SLOTS:
             QVERIFY(!picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(541.0, 183.0), QPointF(541.0, 183.0),
                                      Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -1793,11 +1793,11 @@ private Q_SLOTS:
             QVERIFY(!picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
         }
 
         // WHEN -> Pressed on object3 in VP2
@@ -1820,11 +1820,11 @@ private Q_SLOTS:
             QVERIFY(!picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
         }
 
         // WHEN -> Pressed on object4 in VP1
@@ -1847,11 +1847,11 @@ private Q_SLOTS:
             QVERIFY(picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(160.0, 431.0), QPointF(160.0, 431.0),
                                      Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -1879,11 +1879,11 @@ private Q_SLOTS:
             QVERIFY(picker4->isPressed());
             QVERIFY(!backendPicker5->isPressed());
             QVERIFY(!picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 2);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 0);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 2);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 0);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(447.0, 472.0), QPointF(447.0, 472.0),
                                      Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -1911,11 +1911,11 @@ private Q_SLOTS:
             QVERIFY(!picker4->isPressed());
             QVERIFY(backendPicker5->isPressed());
             QVERIFY(picker5->isPressed());
-            QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-            QCOMPARE(mouseButtonPressedSpy3.count(), 0);
-            QCOMPARE(mouseButtonPressedSpy4.count(), 2);
-            QCOMPARE(mouseButtonPressedSpy5.count(), 1);
+            QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+            QCOMPARE(mouseButtonPressedSpy3.size(), 0);
+            QCOMPARE(mouseButtonPressedSpy4.size(), 2);
+            QCOMPARE(mouseButtonPressedSpy5.size(), 1);
 
             auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(153.0, 195.0), QPointF(153.0, 195.0),
                                      Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
@@ -2011,12 +2011,12 @@ private Q_SLOTS:
         QVERIFY(!earlyReturn);
         QVERIFY(backendPicker->isPressed());
         QVERIFY(picker->isPressed());
-        QCOMPARE(mouseButtonPressedSpy.count(), 1);
-        QCOMPARE(mouseMovedSpy.count(), 0);
-        QCOMPARE(mouseButtonReleasedSpy.count(), 0);
-        QCOMPARE(mouseClickedSpy.count(), 0);
-        QCOMPARE(mouseEntered.count(), 0);
-        QCOMPARE(mouseExited.count(), 0);
+        QCOMPARE(mouseButtonPressedSpy.size(), 1);
+        QCOMPARE(mouseMovedSpy.size(), 0);
+        QCOMPARE(mouseButtonReleasedSpy.size(), 0);
+        QCOMPARE(mouseClickedSpy.size(), 0);
+        QCOMPARE(mouseEntered.size(), 0);
+        QCOMPARE(mouseExited.size(), 0);
     }
 
     void checkPriorityPicking()
@@ -2098,21 +2098,21 @@ private Q_SLOTS:
                 QVERIFY(!earlyReturn);
                 QVERIFY(backendPicker1->isPressed());
                 QVERIFY(picker1->isPressed());
-                QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-                QCOMPARE(mouseMovedSpy1.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy1.count(), 0);
-                QCOMPARE(mouseClickedSpy1.count(), 0);
-                QCOMPARE(mouseEntered1.count(), 0);
-                QCOMPARE(mouseExited1.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+                QCOMPARE(mouseMovedSpy1.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy1.size(), 0);
+                QCOMPARE(mouseClickedSpy1.size(), 0);
+                QCOMPARE(mouseEntered1.size(), 0);
+                QCOMPARE(mouseExited1.size(), 0);
 
                 QVERIFY(!backendPicker2->isPressed());
                 QVERIFY(!picker2->isPressed());
-                QCOMPARE(mouseButtonPressedSpy2.count(), 0);
-                QCOMPARE(mouseMovedSpy2.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy2.count(), 0);
-                QCOMPARE(mouseClickedSpy2.count(), 0);
-                QCOMPARE(mouseEntered2.count(), 0);
-                QCOMPARE(mouseExited2.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy2.size(), 0);
+                QCOMPARE(mouseMovedSpy2.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy2.size(), 0);
+                QCOMPARE(mouseClickedSpy2.size(), 0);
+                QCOMPARE(mouseEntered2.size(), 0);
+                QCOMPARE(mouseExited2.size(), 0);
             }
 
             {
@@ -2124,21 +2124,21 @@ private Q_SLOTS:
 
                 QVERIFY(!backendPicker1->isPressed());
                 QVERIFY(!picker1->isPressed());
-                QCOMPARE(mouseButtonPressedSpy1.count(), 1);
-                QCOMPARE(mouseMovedSpy1.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy1.count(), 1);
-                QCOMPARE(mouseClickedSpy1.count(), 1);
-                QCOMPARE(mouseEntered1.count(), 0);
-                QCOMPARE(mouseExited1.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy1.size(), 1);
+                QCOMPARE(mouseMovedSpy1.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy1.size(), 1);
+                QCOMPARE(mouseClickedSpy1.size(), 1);
+                QCOMPARE(mouseEntered1.size(), 0);
+                QCOMPARE(mouseExited1.size(), 0);
 
                 QVERIFY(!backendPicker2->isPressed());
                 QVERIFY(!picker2->isPressed());
-                QCOMPARE(mouseButtonPressedSpy2.count(), 0);
-                QCOMPARE(mouseMovedSpy2.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy2.count(), 0);
-                QCOMPARE(mouseClickedSpy2.count(), 0);
-                QCOMPARE(mouseEntered2.count(), 0);
-                QCOMPARE(mouseExited2.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy2.size(), 0);
+                QCOMPARE(mouseMovedSpy2.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy2.size(), 0);
+                QCOMPARE(mouseClickedSpy2.size(), 0);
+                QCOMPARE(mouseEntered2.size(), 0);
+                QCOMPARE(mouseExited2.size(), 0);
             }
         }
 
@@ -2166,21 +2166,21 @@ private Q_SLOTS:
                 QVERIFY(!earlyReturn);
                 QVERIFY(!backendPicker1->isPressed());
                 QVERIFY(!picker1->isPressed());
-                QCOMPARE(mouseButtonPressedSpy1.count(), 0);
-                QCOMPARE(mouseMovedSpy1.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy1.count(), 0);
-                QCOMPARE(mouseClickedSpy1.count(), 0);
-                QCOMPARE(mouseEntered1.count(), 0);
-                QCOMPARE(mouseExited1.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy1.size(), 0);
+                QCOMPARE(mouseMovedSpy1.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy1.size(), 0);
+                QCOMPARE(mouseClickedSpy1.size(), 0);
+                QCOMPARE(mouseEntered1.size(), 0);
+                QCOMPARE(mouseExited1.size(), 0);
 
                 QVERIFY(backendPicker2->isPressed());
                 QVERIFY(picker2->isPressed());
-                QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-                QCOMPARE(mouseMovedSpy2.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy2.count(), 0);
-                QCOMPARE(mouseClickedSpy2.count(), 0);
-                QCOMPARE(mouseEntered2.count(), 0);
-                QCOMPARE(mouseExited2.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+                QCOMPARE(mouseMovedSpy2.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy2.size(), 0);
+                QCOMPARE(mouseClickedSpy2.size(), 0);
+                QCOMPARE(mouseEntered2.size(), 0);
+                QCOMPARE(mouseExited2.size(), 0);
             }
 
             {
@@ -2192,21 +2192,21 @@ private Q_SLOTS:
 
                 QVERIFY(!backendPicker1->isPressed());
                 QVERIFY(!picker1->isPressed());
-                QCOMPARE(mouseButtonPressedSpy1.count(), 0);
-                QCOMPARE(mouseMovedSpy1.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy1.count(), 0);
-                QCOMPARE(mouseClickedSpy1.count(), 0);
-                QCOMPARE(mouseEntered1.count(), 0);
-                QCOMPARE(mouseExited1.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy1.size(), 0);
+                QCOMPARE(mouseMovedSpy1.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy1.size(), 0);
+                QCOMPARE(mouseClickedSpy1.size(), 0);
+                QCOMPARE(mouseEntered1.size(), 0);
+                QCOMPARE(mouseExited1.size(), 0);
 
                 QVERIFY(!backendPicker2->isPressed());
                 QVERIFY(!picker2->isPressed());
-                QCOMPARE(mouseButtonPressedSpy2.count(), 1);
-                QCOMPARE(mouseMovedSpy2.count(), 0);
-                QCOMPARE(mouseButtonReleasedSpy2.count(), 1);
-                QCOMPARE(mouseClickedSpy2.count(), 1);
-                QCOMPARE(mouseEntered2.count(), 0);
-                QCOMPARE(mouseExited2.count(), 0);
+                QCOMPARE(mouseButtonPressedSpy2.size(), 1);
+                QCOMPARE(mouseMovedSpy2.size(), 0);
+                QCOMPARE(mouseButtonReleasedSpy2.size(), 1);
+                QCOMPARE(mouseClickedSpy2.size(), 1);
+                QCOMPARE(mouseEntered2.size(), 0);
+                QCOMPARE(mouseExited2.size(), 0);
             }
         }
     }
diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
index 3f259cf05..d72f72031 100644
--- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
+++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
@@ -87,7 +87,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.format(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -95,7 +95,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.format(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -106,7 +106,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.generateMipMaps(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -114,7 +114,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.generateMipMaps(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -125,7 +125,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.width(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -133,7 +133,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.width(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -144,7 +144,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.height(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -152,7 +152,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.height(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -163,7 +163,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.depth(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -171,7 +171,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.depth(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -182,7 +182,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.magnificationFilter(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -190,7 +190,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.magnificationFilter(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -201,7 +201,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.minificationFilter(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -209,7 +209,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.minificationFilter(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -220,7 +220,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.maximumAnisotropy(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -228,7 +228,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.maximumAnisotropy(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -239,7 +239,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.comparisonFunction(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -247,7 +247,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.comparisonFunction(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -258,7 +258,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.comparisonMode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -266,7 +266,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.comparisonMode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -277,7 +277,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.layers(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -285,7 +285,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.layers(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -296,7 +296,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.samples(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -304,7 +304,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.samples(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -315,7 +315,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTexture.mipLevels(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -323,7 +323,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTexture.mipLevels(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -756,7 +756,7 @@ private Q_SLOTS:
             dTexture->setStatus(newStatus);
 
             // THEN
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(arbiter.dirtyNodes().size(), 0);
             QCOMPARE(abstractTexture.status(), newStatus);
 
@@ -766,7 +766,7 @@ private Q_SLOTS:
             dTexture->setStatus(newStatus);
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
             QCOMPARE(arbiter.dirtyNodes().size(), 0);
             QCOMPARE(abstractTexture.status(), newStatus);
         }
@@ -783,7 +783,7 @@ private Q_SLOTS:
             dTexture->setHandleType(newType);
 
             // THEN
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(arbiter.dirtyNodes().size(), 0);
             QCOMPARE(abstractTexture.handleType(), newType);
 
@@ -793,7 +793,7 @@ private Q_SLOTS:
             dTexture->setHandleType(newType);
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
             QCOMPARE(arbiter.dirtyNodes().size(), 0);
             QCOMPARE(abstractTexture.handleType(), newType);
         }
@@ -809,7 +809,7 @@ private Q_SLOTS:
             dTexture->setHandle(QVariant(1));
 
             // THEN
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(abstractTexture.handle(), QVariant(1));
 
             // WHEN
@@ -818,7 +818,7 @@ private Q_SLOTS:
             dTexture->setHandle(QVariant(1));
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
             QCOMPARE(arbiter.dirtyNodes().size(), 0);
             QCOMPARE(abstractTexture.handle(), QVariant(1));
         }
diff --git a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
index 210b616c3..c8373962c 100644
--- a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
+++ b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp
@@ -54,7 +54,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTextureImage.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -62,7 +62,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTextureImage.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -73,7 +73,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTextureImage.layer(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -81,7 +81,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTextureImage.layer(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -92,7 +92,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(abstractTextureImage.face(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -100,7 +100,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(abstractTextureImage.face(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qcameralens/tst_qcameralens.cpp b/tests/auto/render/qcameralens/tst_qcameralens.cpp
index 6211d3a12..2779284c8 100644
--- a/tests/auto/render/qcameralens/tst_qcameralens.cpp
+++ b/tests/auto/render/qcameralens/tst_qcameralens.cpp
@@ -52,7 +52,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.projectionType(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -60,7 +60,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.projectionType(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -71,7 +71,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.nearPlane(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -79,7 +79,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.nearPlane(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -90,7 +90,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.farPlane(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -98,7 +98,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.farPlane(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -109,7 +109,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.fieldOfView(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.fieldOfView(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -128,7 +128,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.aspectRatio(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -136,7 +136,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.aspectRatio(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -147,7 +147,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.left(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -155,7 +155,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.left(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -166,7 +166,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.right(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -174,7 +174,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.right(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -185,7 +185,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.bottom(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -193,7 +193,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.bottom(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -204,7 +204,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.top(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -212,7 +212,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.top(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -223,7 +223,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.exposure(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().toFloat(), -2.0f);
 
             // WHEN
@@ -232,7 +232,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.exposure(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -245,7 +245,7 @@ private Q_SLOTS:
             QVERIFY(spy.isValid());
             QCOMPARE(cameraLens.projectionMatrix(), newValue);
             QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::CustomProjection);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -253,7 +253,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(cameraLens.projectionMatrix(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -269,7 +269,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1
+            QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1
             QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::OrthographicProjection);
             QCOMPARE(cameraLens.nearPlane(), 0.5f);
             QCOMPARE(cameraLens.farPlane(), 50.0f);
@@ -292,7 +292,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1
+            QCOMPARE(spy.size(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1
             QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::PerspectiveProjection);
             QCOMPARE(cameraLens.nearPlane(), 0.5f);
             QCOMPARE(cameraLens.farPlane(), 50.0f);
@@ -313,7 +313,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1
+            QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1
             QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::FrustumProjection);
             QCOMPARE(cameraLens.nearPlane(), 0.5f);
             QCOMPARE(cameraLens.farPlane(), 50.0f);
diff --git a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp
index d7f801a12..cd752932c 100644
--- a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp
+++ b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(computeCommand.workGroupX(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -49,7 +49,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(computeCommand.workGroupX(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -60,7 +60,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(computeCommand.workGroupY(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -68,7 +68,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(computeCommand.workGroupY(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -79,7 +79,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(computeCommand.workGroupZ(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -87,7 +87,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(computeCommand.workGroupZ(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -98,7 +98,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(computeCommand.runType(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -106,7 +106,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(computeCommand.runType(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
index 70a6b1b01..21165f370 100644
--- a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
+++ b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp
@@ -40,7 +40,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(dispatchCompute.workGroupX(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -48,7 +48,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(dispatchCompute.workGroupX(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -59,7 +59,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(dispatchCompute.workGroupY(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -67,7 +67,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(dispatchCompute.workGroupY(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -78,7 +78,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(dispatchCompute.workGroupZ(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -86,7 +86,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(dispatchCompute.workGroupZ(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp
index 76549ff8b..88b1ac104 100644
--- a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp
+++ b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp
@@ -77,7 +77,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), texture);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -86,7 +86,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), texture);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // WHEN
             light.setIrradiance(nullptr);
@@ -94,7 +94,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), nullptr);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -107,7 +107,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), texture);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -116,7 +116,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), nullptr);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -129,7 +129,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), texture);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -138,7 +138,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), nullptr);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -153,7 +153,7 @@ private Q_SLOTS:
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture);
             QCOMPARE(shaderData->property("irradianceSize").value<QVector3D>(),
                      QVector3D(texture->width(), texture->height(), texture->depth()));
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -183,7 +183,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.irradiance(), nullptr);
             QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
 
             // THEN
@@ -200,7 +200,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), texture);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -209,7 +209,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), texture);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // WHEN
             light.setSpecular(nullptr);
@@ -217,7 +217,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), nullptr);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -230,7 +230,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), texture);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -239,7 +239,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), nullptr);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -252,7 +252,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), texture);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -261,7 +261,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), nullptr);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
         }
         {
@@ -276,7 +276,7 @@ private Q_SLOTS:
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture);
             QCOMPARE(shaderData->property("specularSize").value<QVector3D>(),
                      QVector3D(texture->width(), texture->height(), texture->depth()));
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture);
 
             // WHEN
@@ -306,7 +306,7 @@ private Q_SLOTS:
             // THEN
             QCOMPARE(light.specular(), nullptr);
             QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr);
 
             // THEN
diff --git a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp
index 3560bbfd6..2c9f7b36f 100644
--- a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp
+++ b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp
@@ -39,7 +39,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(filterKey.value(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -47,7 +47,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(filterKey.value(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -58,7 +58,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(filterKey.name(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -66,7 +66,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(filterKey.name(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index 7371b78fb..43aa915d7 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -115,8 +115,8 @@ private Q_SLOTS:
         dNode->setExtent(minExt, maxExt);
 
         // THEN
-        QCOMPARE(spyMinExtent.count(), 1);
-        QCOMPARE(spyMaxExtent.count(), 1);
+        QCOMPARE(spyMinExtent.size(), 1);
+        QCOMPARE(spyMaxExtent.size(), 1);
         QCOMPARE(geometry->minExtent(), minExt);
         QCOMPARE(geometry->maxExtent(), maxExt);
 
@@ -127,8 +127,8 @@ private Q_SLOTS:
         dNode->setExtent(minExt, maxExt);
 
         // THEN
-        QCOMPARE(spyMinExtent.count(), 0);
-        QCOMPARE(spyMaxExtent.count(), 0);
+        QCOMPARE(spyMinExtent.size(), 0);
+        QCOMPARE(spyMaxExtent.size(), 0);
     }
 };
 
diff --git a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
index 31b8d55f2..f7240eb7f 100644
--- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
+++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp
@@ -59,7 +59,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(apiFilter.profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
         }
 
         {
@@ -69,7 +69,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(apiFilter.majorVersion(), 4);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
         }
 
         {
@@ -79,7 +79,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(apiFilter.minorVersion(), 5);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
         }
 
         {
@@ -90,7 +90,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(apiFilter.extensions(), extensions);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
         }
 
         {
@@ -101,7 +101,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(apiFilter.vendor(), vendor);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
         }
     }
 
diff --git a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp
index ba6ad0758..71e74d785 100644
--- a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp
+++ b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(memoryBarrier.waitOperations(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -51,7 +51,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(memoryBarrier.waitOperations(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp
index 63af32182..6dad93483 100644
--- a/tests/auto/render/qmesh/tst_qmesh.cpp
+++ b/tests/auto/render/qmesh/tst_qmesh.cpp
@@ -53,7 +53,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mesh.source(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -61,7 +61,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mesh.source(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -72,7 +72,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(mesh.meshName(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -80,7 +80,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(mesh.meshName(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qparameter/tst_qparameter.cpp b/tests/auto/render/qparameter/tst_qparameter.cpp
index 7aff50ad2..5511cc7ad 100644
--- a/tests/auto/render/qparameter/tst_qparameter.cpp
+++ b/tests/auto/render/qparameter/tst_qparameter.cpp
@@ -39,7 +39,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(parameter.name(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -47,7 +47,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(parameter.name(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -58,7 +58,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(parameter.value(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -66,7 +66,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(parameter.value(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -169,13 +169,13 @@ private Q_SLOTS:
             parameter.setValue(QVariant::fromValue(node.data()));
 
             // THEN
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(parameter.value(), QVariant::fromValue(node.data()));
             spy.clear();
         }
 
         // THEN
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(parameter.value(), QVariant());
     }
 
diff --git a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
index 95bca8722..b47d1de1f 100644
--- a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
+++ b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp
@@ -47,7 +47,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(proximityFilter.entity(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -55,7 +55,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(proximityFilter.entity(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -66,7 +66,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(proximityFilter.distanceThreshold(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -74,7 +74,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(proximityFilter.distanceThreshold(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qraycaster/tst_qraycaster.cpp b/tests/auto/render/qraycaster/tst_qraycaster.cpp
index cc2307025..9cb4521b3 100644
--- a/tests/auto/render/qraycaster/tst_qraycaster.cpp
+++ b/tests/auto/render/qraycaster/tst_qraycaster.cpp
@@ -168,7 +168,7 @@ private Q_SLOTS:
 
         // THEN
         // Check that the QRayCaster triggers the expected signal
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
     }
 };
 
diff --git a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
index bf7e211d7..65613ec59 100644
--- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
+++ b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp
@@ -50,7 +50,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderPass.shaderProgram(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -58,7 +58,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderPass.shaderProgram(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
index 11ae269df..e4a6cc600 100644
--- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
+++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
@@ -23,8 +23,8 @@ private Q_SLOTS:
     {
         QScopedPointer<Qt3DRender::QRenderPassFilter> defaultRenderPassFilter(new Qt3DRender::QRenderPassFilter);
 
-        QCOMPARE(defaultRenderPassFilter->matchAny().count(), 0);
-        QCOMPARE(defaultRenderPassFilter->parameters().count(), 0);
+        QCOMPARE(defaultRenderPassFilter->matchAny().size(), 0);
+        QCOMPARE(defaultRenderPassFilter->parameters().size(), 0);
     }
 
     void checkPropertyUpdates()
diff --git a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
index b9b85355a..5d2109dd0 100644
--- a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
+++ b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp
@@ -54,7 +54,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderSettings.renderPolicy(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -62,7 +62,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderSettings.renderPolicy(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -74,7 +74,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderSettings.activeFrameGraph(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -82,7 +82,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderSettings.activeFrameGraph(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -93,7 +93,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(pickingSettings->pickMethod(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -101,7 +101,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(pickingSettings->pickMethod(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -112,7 +112,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(pickingSettings->pickResultMode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -120,7 +120,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(pickingSettings->pickResultMode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -131,7 +131,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -139,7 +139,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
     }
diff --git a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
index 5f6eed85d..565c31b86 100644
--- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
+++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
@@ -103,7 +103,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderSurfaceSelector.surface(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -111,7 +111,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderSurfaceSelector.surface(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // Prevents crashes with temporary window being destroyed
             renderSurfaceSelector.setSurface(nullptr);
@@ -126,7 +126,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -134,7 +134,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -145,7 +145,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -153,7 +153,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
index fb0ad4524..c54ef1a6c 100644
--- a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
+++ b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp
@@ -50,7 +50,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderTargetOutput.attachmentPoint(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -58,7 +58,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderTargetOutput.attachmentPoint(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -70,7 +70,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderTargetOutput.texture(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -78,7 +78,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderTargetOutput.texture(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -90,7 +90,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderTargetOutput.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -98,7 +98,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderTargetOutput.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -110,7 +110,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderTargetOutput.layer(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -118,7 +118,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderTargetOutput.layer(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
         {
@@ -130,7 +130,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(renderTargetOutput.face(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -138,7 +138,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(renderTargetOutput.face(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
         }
     }
diff --git a/tests/auto/render/qscene2d/tst_qscene2d.cpp b/tests/auto/render/qscene2d/tst_qscene2d.cpp
index ff1e7e4a4..f39f1e983 100644
--- a/tests/auto/render/qscene2d/tst_qscene2d.cpp
+++ b/tests/auto/render/qscene2d/tst_qscene2d.cpp
@@ -51,7 +51,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(scene2d.output(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -59,7 +59,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(scene2d.output(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -70,7 +70,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(scene2d.renderPolicy(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -78,7 +78,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(scene2d.renderPolicy(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -89,7 +89,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(scene2d.item(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -97,7 +97,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(scene2d.item(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -109,7 +109,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(scene2d.isMouseEnabled(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -117,7 +117,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(scene2d.isMouseEnabled(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp
index e7a1cf11e..7160478b6 100644
--- a/tests/auto/render/qsetfence/tst_qsetfence.cpp
+++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp
@@ -56,14 +56,14 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(setFence.handleType(), Qt3DRender::QSetFence::OpenGLFenceId);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
             dNode->setHandleType(Qt3DRender::QSetFence::OpenGLFenceId);
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
 
         {
@@ -79,14 +79,14 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(setFence.handle(),QVariant(984));
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
             dNode->setHandle(QVariant(984));
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 };
diff --git a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
index 982ce93a4..3b19aa588 100644
--- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
+++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.texture(), &newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -57,7 +57,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.texture(), &newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -68,7 +68,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.layered(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -76,7 +76,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.layered(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -87,7 +87,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -95,7 +95,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.mipLevel(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -106,7 +106,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.layer(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -114,7 +114,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.layer(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -125,7 +125,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.access(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -133,7 +133,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.access(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -144,7 +144,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.format(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -152,7 +152,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderImage.format(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -351,13 +351,13 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderImage.texture(), &tex);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
         }
         // THEN
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QVERIFY(shaderImage.texture() == nullptr);
     }
 
diff --git a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
index 8927ec73f..1db1b51e5 100644
--- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
+++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
@@ -53,7 +53,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.vertexShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -61,7 +61,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.vertexShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -72,7 +72,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -80,7 +80,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -91,7 +91,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -99,7 +99,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -110,7 +110,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.geometryShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -118,7 +118,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.geometryShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -129,7 +129,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.fragmentShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -137,7 +137,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.fragmentShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -148,7 +148,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.computeShaderCode(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -156,7 +156,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.computeShaderCode(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -167,7 +167,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(shaderProgram.format(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -175,7 +175,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(shaderProgram.format(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -375,7 +375,7 @@ private Q_SLOTS:
         dNode->setLog(logValue);
 
         // THEN
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(log(), logValue);
 
@@ -384,7 +384,7 @@ private Q_SLOTS:
         dNode->setLog(logValue);
 
         // THEN
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(log(), logValue);
 
@@ -409,7 +409,7 @@ private Q_SLOTS:
         dNode->setStatus(newStatus);
 
         // THEN
-        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.size(), 1);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(status(), newStatus);
 
@@ -418,7 +418,7 @@ private Q_SLOTS:
         dNode->setStatus(newStatus);
 
         // THEN
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(spy.size(), 0);
         QCOMPARE(arbiter.dirtyNodes().size(), 0);
         QCOMPARE(status(), newStatus);
 
@@ -463,7 +463,7 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(arbiter.dirtyNodes().size(), 1);
 
             spy.clear();
@@ -475,7 +475,7 @@ private Q_SLOTS:
             QCoreApplication::processEvents();
 
             // THEN
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
             QCOMPARE(arbiter.dirtyNodes().size(), 1);
         }
     }
diff --git a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp
index 085f670c4..eef50d510 100644
--- a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp
+++ b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp
@@ -57,7 +57,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.shaderProgram(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -65,7 +65,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.shaderProgram(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -76,7 +76,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.enabledLayers(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -84,7 +84,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.enabledLayers(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -95,7 +95,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.vertexShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -103,7 +103,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.vertexShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -114,7 +114,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.tessellationControlShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -122,7 +122,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.tessellationControlShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -133,7 +133,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -141,7 +141,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -152,7 +152,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.geometryShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -160,7 +160,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.geometryShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -171,7 +171,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.fragmentShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -179,7 +179,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.fragmentShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -190,7 +190,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(builder.computeShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -198,7 +198,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(builder.computeShaderGraph(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
@@ -485,7 +485,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(vertexShaderCode(), QByteArrayLiteral("vertex"));
         }
         {
@@ -495,7 +495,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(fragmentShaderCode(), QByteArrayLiteral("fragment"));
         }
         {
@@ -505,7 +505,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(geometryShaderCode(), QByteArrayLiteral("geometry"));
         }
         {
@@ -516,7 +516,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(computeShaderCode(), QByteArrayLiteral("compute"));
         }
         {
@@ -526,7 +526,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(tessellationControlShaderCode(), QByteArrayLiteral("control"));
         }
         {
@@ -536,7 +536,7 @@ private Q_SLOTS:
 
             // THEN
             QVERIFY(spy.isValid());
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
             QCOMPARE(tessellationEvaluationShaderCode(), QByteArrayLiteral("eval"));
         }
     }
diff --git a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp
index 0d55642af..153f7d32d 100644
--- a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp
+++ b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp
@@ -42,7 +42,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(glTexture.textureId(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -50,7 +50,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(glTexture.textureId(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qtechnique/tst_qtechnique.cpp b/tests/auto/render/qtechnique/tst_qtechnique.cpp
index d702c094e..0b04e668e 100644
--- a/tests/auto/render/qtechnique/tst_qtechnique.cpp
+++ b/tests/auto/render/qtechnique/tst_qtechnique.cpp
@@ -110,7 +110,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -118,14 +118,14 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // WHEN
             technique.graphicsApiFilter()->setMinorVersion(2);
 
             // THEN
             QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -133,14 +133,14 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
 
             // WHEN
             technique.graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::CoreProfile);
 
             // THEN
             QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -148,7 +148,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
index 828d1a9c0..fd6d5ebb9 100644
--- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
+++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
@@ -23,8 +23,8 @@ private Q_SLOTS:
     {
         QScopedPointer<Qt3DRender::QTechniqueFilter> defaulttechniqueFilter(new Qt3DRender::QTechniqueFilter);
 
-        QCOMPARE(defaulttechniqueFilter->matchAll().count(), 0);
-        QCOMPARE(defaulttechniqueFilter->parameters().count(), 0);
+        QCOMPARE(defaulttechniqueFilter->matchAll().size(), 0);
+        QCOMPARE(defaulttechniqueFilter->parameters().size(), 0);
     }
 
     void checkPropertyUpdates()
diff --git a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp
index f6bc9a2e1..76705de6f 100644
--- a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp
+++ b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp
@@ -43,7 +43,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(textureImage.source(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -51,7 +51,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(textureImage.source(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -62,7 +62,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(textureImage.isMirrored(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -70,7 +70,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(textureImage.isMirrored(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp
index 0495f4517..6d41a0e0c 100644
--- a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp
+++ b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp
@@ -49,7 +49,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(textureLoader.source(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -57,7 +57,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(textureLoader.source(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -68,7 +68,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(textureLoader.isMirrored(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -76,7 +76,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(textureLoader.isMirrored(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp
index 2a9b0be98..f52141626 100644
--- a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp
+++ b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp
@@ -46,7 +46,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(waitFence.handleType(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -54,7 +54,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(waitFence.handleType(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -65,7 +65,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(waitFence.handle(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -73,7 +73,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(waitFence.handle(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -84,7 +84,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(waitFence.waitOnCPU(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -92,7 +92,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(waitFence.waitOnCPU(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
         {
             // WHEN
@@ -103,7 +103,7 @@ private Q_SLOTS:
             // THEN
             QVERIFY(spy.isValid());
             QCOMPARE(waitFence.timeout(), newValue);
-            QCOMPARE(spy.count(), 1);
+            QCOMPARE(spy.size(), 1);
 
             // WHEN
             spy.clear();
@@ -111,7 +111,7 @@ private Q_SLOTS:
 
             // THEN
             QCOMPARE(waitFence.timeout(), newValue);
-            QCOMPARE(spy.count(), 0);
+            QCOMPARE(spy.size(), 0);
         }
     }
 
diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
index ad33cda9c..8bf581271 100644
--- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
+++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp
@@ -294,7 +294,7 @@ private Q_SLOTS:
         QVERIFY(!rayCaster->isEnabled());
         auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes();
         qDebug() << dirtyNodes;
-        QCOMPARE(dirtyNodes.count(), 1); // hits & disable
+        QCOMPARE(dirtyNodes.size(), 1); // hits & disable
         QCOMPARE(rayCaster->hits().size(), numIntersections);
 
         if (numIntersections)
@@ -356,7 +356,7 @@ private Q_SLOTS:
         QVERIFY(!backendRayCaster->isEnabled());
         QVERIFY(!rayCaster->isEnabled());
         auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes();
-        QCOMPARE(dirtyNodes.count(), 1); // hits & disable
+        QCOMPARE(dirtyNodes.size(), 1); // hits & disable
         QCOMPARE(rayCaster->hits().size(), numIntersections);
 
         if (numIntersections)
diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
index 66552300f..6c03fcb62 100644
--- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
+++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
@@ -622,10 +622,10 @@ private slots:
             b.generateCode(Qt3DRender::QShaderProgram::Vertex);
 
             // THEN
-            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1);
+            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1);
 
             hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex);
-            QCOMPARE(hashKey.length(), 40);
+            QCOMPARE(hashKey.size(), 40);
 
             QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(),
                      QString::fromUtf8(hashKey) + QLatin1String(".qt3d"));
@@ -639,7 +639,7 @@ private slots:
             b.generateCode(Qt3DRender::QShaderProgram::Vertex);
 
             // THEN
-            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1);
+            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1);
             QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(),
                      QString::fromUtf8(hashKey) + QLatin1String(".qt3d"));
         }
@@ -653,7 +653,7 @@ private slots:
             QByteArray gl2HashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex);
 
             // THEN
-            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 2);
+            QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 2);
             QVERIFY(gl2HashKey != hashKey);
         }
     }
@@ -691,10 +691,10 @@ private slots:
         b.generateCode(Qt3DRender::QShaderProgram::Vertex);
 
         // THEN
-        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1);
+        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1);
 
         const QByteArray hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex);
-        QCOMPARE(hashKey.length(), 40);
+        QCOMPARE(hashKey.size(), 40);
 
         QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(),
                  QString::fromUtf8(hashKey) + QLatin1String(".qt3d"));
@@ -740,7 +740,7 @@ private slots:
         b.generateCode(Qt3DRender::QShaderProgram::Vertex);
 
         // THEN
-        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 0);
+        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 0);
     }
 
     void checkForceRebuildCache()
@@ -776,7 +776,7 @@ private slots:
         b.generateCode(Qt3DRender::QShaderProgram::Vertex);
 
         // THEN -> We have rebuilt the shader file (even if we don't use it)
-        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1);
+        QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1);
     }
 };