STL compatibility: use size() instead of count()

This is a simple find and replace with manual sanity check.

Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

9 files changed, 181 insertions, 181 deletions

diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 9d859880e..2e8cba574 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -279,12 +279,12 @@ void TestApi::buildGraphInfo()
     bgInfo = qbs::Project::getBuildGraphInfo(bgFilePath, requestedProperties);
     QVERIFY2(!bgInfo.error.hasError(), qPrintable(bgInfo.error.toString()));
     QCOMPARE(bgFilePath, bgInfo.bgFilePath);
-    QCOMPARE(bgInfo.profileData.count(), 1);
-    QCOMPARE(bgInfo.profileData.value(p.p.name()).toMap().count(), 1);
+    QCOMPARE(bgInfo.profileData.size(), 1);
+    QCOMPARE(bgInfo.profileData.value(p.p.name()).toMap().size(), 1);
     QCOMPARE(bgInfo.profileData.value(p.p.name()).toMap().value("qbs").toMap().value("targetOS"),
              p.p.value("qbs.targetOS"));
     QCOMPARE(bgInfo.overriddenProperties, setupParams.overriddenValues());
-    QCOMPARE(bgInfo.requestedProperties.count(), requestedProperties.count());
+    QCOMPARE(bgInfo.requestedProperties.size(), requestedProperties.size());
     QCOMPARE(bgInfo.requestedProperties.value("qbs.architecture").toString(), QString("arm"));
     QCOMPARE(bgInfo.requestedProperties.value("qbs.shellPath").toString(), QString("/bin/bash"));
     QCOMPARE(bgInfo.requestedProperties.value("qbs.targetOS").toStringList(), QStringList("xenix"));
@@ -656,9 +656,9 @@ void TestApi::changeContent()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     qbs::Project project = job->project();
     qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     qbs::ProductData product = projectData.allProducts().front();
-    QVERIFY(product.groups().count() >= 8);
+    QVERIFY(product.groups().size() >= 8);
 
     // Error handling: Invalid product.
     qbs::ErrorInfo errorInfo = project.addGroup(qbs::ProductData(), "blubb");
@@ -689,9 +689,9 @@ void TestApi::changeContent()
 
     // Add files to empty array literal.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
-    QVERIFY(product.groups().count() >= 10);
+    QVERIFY(product.groups().size() >= 10);
     qbs::GroupData group = findGroup(product, "New Group 1");
     QVERIFY(group.isValid());
     errorInfo = project.addFiles(product, group, QStringList() << "file.h" << "file.cpp");
@@ -699,9 +699,9 @@ void TestApi::changeContent()
 
     // Error handling: Add the same file again.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
-    QVERIFY(product.groups().count() >= 10);
+    QVERIFY(product.groups().size() >= 10);
     group = findGroup(product, "New Group 1");
     QVERIFY(group.isValid());
     errorInfo = project.addFiles(product, group, QStringList() << "file.cpp");
@@ -714,9 +714,9 @@ void TestApi::changeContent()
 
     // Error handling: Try to remove the same file again.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
-    QVERIFY(product.groups().count() >= 10);
+    QVERIFY(product.groups().size() >= 10);
     group = findGroup(product, "New Group 1");
     QVERIFY(group.isValid());
     errorInfo = project.removeFiles(product, group, QStringList() << "file.h");
@@ -736,7 +736,7 @@ void TestApi::changeContent()
 
     // Add file to non-empty array literal.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 1");
     QVERIFY(group.isValid());
@@ -745,14 +745,14 @@ void TestApi::changeContent()
 
     // Add files to list represented as a single string.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     errorInfo = project.addFiles(product, qbs::GroupData(), QStringList() << "newfile2.txt");
     VERIFY_NO_ERROR(errorInfo);
 
     // Add files to list represented as an identifier.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 2");
     QVERIFY(group.isValid());
@@ -761,7 +761,7 @@ void TestApi::changeContent()
 
     // Add files to list represented as a block of code (not yet implemented).
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 3");
     QVERIFY(group.isValid());
@@ -771,7 +771,7 @@ void TestApi::changeContent()
 
     // Add file to group with directory prefix.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 4");
     QVERIFY(group.isValid());
@@ -780,7 +780,7 @@ void TestApi::changeContent()
 
     // Error handling: Add file to group with non-directory prefix.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 5");
     QVERIFY(group.isValid());
@@ -790,15 +790,15 @@ void TestApi::changeContent()
 
     // Remove group.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Existing Group 5");
     QVERIFY(group.isValid());
     errorInfo = project.removeGroup(product, group);
     VERIFY_NO_ERROR(errorInfo);
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
-    QVERIFY(projectData.products().front().groups().count() >= 9);
+    QVERIFY(projectData.products().size() == 1);
+    QVERIFY(projectData.products().front().groups().size() >= 9);
 
     // Error handling: Try to remove the same group again.
     errorInfo = project.removeGroup(product, group);
@@ -807,7 +807,7 @@ void TestApi::changeContent()
 
     // Add a file to a group where the file name is already matched by a wildcard.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Group with wildcards");
     QVERIFY(group.isValid());
@@ -817,17 +817,17 @@ void TestApi::changeContent()
     errorInfo = project.addFiles(product, group, QStringList() << newFile.fileName());
     VERIFY_NO_ERROR(errorInfo);
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Group with wildcards");
     QVERIFY(group.isValid());
-    QCOMPARE(group.sourceArtifactsFromWildcards().count(), 1);
+    QCOMPARE(group.sourceArtifactsFromWildcards().size(), 1);
     QCOMPARE(group.sourceArtifactsFromWildcards().front().filePath(),
              QFileInfo(newFile).absoluteFilePath());
 
     // Error checking: Try to remove a file that originates from a wildcard pattern.
     projectData = project.projectData();
-    QVERIFY(projectData.products().count() == 1);
+    QVERIFY(projectData.products().size() == 1);
     product = projectData.products().front();
     group = findGroup(product, "Other group with wildcards");
     QVERIFY(group.isValid());
@@ -859,8 +859,8 @@ void TestApi::changeContent()
 
     // Can't use Project::operator== here, as the target artifacts will differ due to the build
     // not having run yet.
-    bool projectDataMatches = newProjectData.products().count() == 1
-            && projectData.products().count() == 1
+    bool projectDataMatches = newProjectData.products().size() == 1
+            && projectData.products().size() == 1
             && newProjectData.products().front().groups() == projectData.products().front().groups();
     if (!projectDataMatches) {
         qDebug("This is the assumed project:");
@@ -904,7 +904,7 @@ void TestApi::changeContent()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     project = job->project();
     projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     product = projectData.allProducts().front();
     errorInfo = project.addFiles(product, qbs::GroupData(), QStringList("main.cpp"));
     VERIFY_NO_ERROR(errorInfo);
@@ -922,8 +922,8 @@ void TestApi::changeContent()
     // Can't use Project::operator== here, as the target artifacts will differ due to the build
     // not having run yet.
     newProjectData = job->project().projectData();
-    projectDataMatches = newProjectData.products().count() == 1
-            && projectData.products().count() == 1
+    projectDataMatches = newProjectData.products().size() == 1
+            && projectData.products().size() == 1
             && newProjectData.products().front().groups() == projectData.products().front().groups();
     if (!projectDataMatches) {
         printProjectData(projectData);
@@ -944,7 +944,7 @@ void TestApi::commandExtraction()
     QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString()));
     qbs::Project project = setupJob->project();
     qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     qbs::ProductData productData = projectData.allProducts().front();
     qbs::ErrorInfo errorInfo;
     const QString projectDirPath = QDir::cleanPath(QFileInfo(setupParams.projectFilePath()).path());
@@ -953,7 +953,7 @@ void TestApi::commandExtraction()
     // Before the first build, no rules exist.
     qbs::RuleCommandList commands
             = project.ruleCommands(productData, sourceFilePath, "obj", &errorInfo);
-    QCOMPARE(commands.count(), 0);
+    QCOMPARE(commands.size(), 0);
     QVERIFY(errorInfo.hasError());
     QVERIFY2(errorInfo.toString().contains("No rule"), qPrintable(errorInfo.toString()));
 
@@ -963,13 +963,13 @@ void TestApi::commandExtraction()
     waitForFinished(buildJob.get());
     QVERIFY2(!buildJob->error().hasError(), qPrintable(buildJob->error().toString()));
     projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     productData = projectData.allProducts().front();
     errorInfo = qbs::ErrorInfo();
 
     // After the build, the compile command must be found.
     commands = project.ruleCommands(productData, sourceFilePath, "obj", &errorInfo);
-    QCOMPARE(commands.count(), 1);
+    QCOMPARE(commands.size(), 1);
     QVERIFY2(!errorInfo.hasError(), qPrintable(errorInfo.toString()));
     const qbs::RuleCommand command = commands.front();
     QCOMPARE(command.type(), qbs::RuleCommand::ProcessCommandType);
@@ -1041,7 +1041,7 @@ void TestApi::errorInSetupRunEnvironment()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     const qbs::Project project = job->project();
     QVERIFY(project.isValid());
-    QCOMPARE(project.projectData().products().count(), 1);
+    QCOMPARE(project.projectData().products().size(), 1);
     const qbs::ProductData product = project.projectData().products().front();
 
     bool exceptionCaught = false;
@@ -1082,14 +1082,14 @@ void TestApi::disabledInstallGroup()
     VERIFY_NO_ERROR(errorInfo);
 
     qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     qbs::ProductData product = projectData.allProducts().front();
     const QList<qbs::ArtifactData> targets = product.targetArtifacts();
-    QCOMPARE(targets.count(), 1);
+    QCOMPARE(targets.size(), 1);
     QVERIFY(targets.front().isGenerated());
     QVERIFY(targets.front().isExecutable());
     QVERIFY(targets.front().isTargetArtifact());
-    QCOMPARE(projectData.installableArtifacts().count(), 0);
+    QCOMPARE(projectData.installableArtifacts().size(), 0);
     QCOMPARE(product.targetExecutable(), targets.front().filePath());
 }
 
@@ -1204,10 +1204,10 @@ void TestApi::fileTagsFilterOverride()
     VERIFY_NO_ERROR(errorInfo);
 
     qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     const qbs::ProductData product = projectData.allProducts().front();
     QList<qbs::ArtifactData> installableFiles = product.installableArtifacts();
-    QCOMPARE(installableFiles.count(), 1);
+    QCOMPARE(installableFiles.size(), 1);
     QVERIFY(installableFiles.front().installData().installFilePath().contains("habicht"));
 }
 
@@ -1226,10 +1226,10 @@ void TestApi::generatedFilesList()
     QVERIFY(waitForFinished(buildJob.get()));
     VERIFY_NO_ERROR(buildJob->error());
     const qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.products().count(), 1);
+    QCOMPARE(projectData.products().size(), 1);
     const qbs::ProductData product = projectData.products().front();
     QString uiFilePath;
-    QVERIFY(product.generatedArtifacts().count() >= 6);
+    QVERIFY(product.generatedArtifacts().size() >= 6);
     foreach (const qbs::ArtifactData &a, product.generatedArtifacts()) {
         QVERIFY(a.isGenerated());
         QFileInfo fi(a.filePath());
@@ -1257,12 +1257,12 @@ void TestApi::generatedFilesList()
     }
     QVERIFY(!uiFilePath.isEmpty());
     const QStringList directParents = project.generatedFiles(product, uiFilePath, false);
-    QCOMPARE(directParents.count(), 1);
+    QCOMPARE(directParents.size(), 1);
     const QFileInfo uiHeaderFileInfo(directParents.front());
     QCOMPARE(uiHeaderFileInfo.fileName(), QLatin1String("ui_mainwindow.h"));
     QVERIFY(!uiHeaderFileInfo.exists());
     const QStringList allParents = project.generatedFiles(product, uiFilePath, true);
-    QCOMPARE(allParents.count(), 3);
+    QCOMPARE(allParents.size(), 3);
 }
 
 void TestApi::infiniteLoopBuilding()
@@ -1347,13 +1347,13 @@ void TestApi::installableFiles()
     VERIFY_NO_ERROR(errorInfo);
 
     qbs::ProjectData projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 2);
+    QCOMPARE(projectData.allProducts().size(), 2);
     qbs::ProductData product = findElem(projectData.allProducts(), [](const qbs::ProductData &p) {
         return p.name() == QLatin1String("installedApp");
     });
     QVERIFY(product.isValid());
     QList<qbs::ArtifactData> installableFiles = product.installableArtifacts();
-    QCOMPARE(installableFiles.count(), 2);
+    QCOMPARE(installableFiles.size(), 2);
     foreach (const qbs::ArtifactData &f,installableFiles) {
         if (!f.filePath().endsWith("main.cpp")) {
             QVERIFY(f.isExecutable());
@@ -1372,10 +1372,10 @@ void TestApi::installableFiles()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     project = job->project();
     projectData = project.projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     product = projectData.allProducts().front();
     installableFiles = product.installableArtifacts();
-    QCOMPARE(installableFiles.count(), 2);
+    QCOMPARE(installableFiles.size(), 2);
     foreach (const qbs::ArtifactData &f, installableFiles)
         QVERIFY(!f.isExecutable());
     QCOMPARE(installableFiles.front().installData().localInstallFilePath(),
@@ -1393,7 +1393,7 @@ void TestApi::isRunnable()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     qbs::Project project = job->project();
     const QList<qbs::ProductData> products = project.projectData().products();
-    QCOMPARE(products.count(), 2);
+    QCOMPARE(products.size(), 2);
     foreach (const qbs::ProductData &p, products) {
         QVERIFY2(p.name() == "app" || p.name() == "lib", qPrintable(p.name()));
         if (p.name() == "app")
@@ -1514,7 +1514,7 @@ void TestApi::localProfiles()
 
     qbs::ProjectData project = job->project().projectData();
     QList<qbs::ProductData> products = project.allProducts();
-    QCOMPARE(products.count(), 4);
+    QCOMPARE(products.size(), 4);
     qbs::ProductData libMingw;
     qbs::ProductData libClang;
     qbs::ProductData appDebug;
@@ -1587,7 +1587,7 @@ void TestApi::localProfiles()
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     project = job->project().projectData();
     products = project.allProducts();
-    QCOMPARE(products.count(), 4);
+    QCOMPARE(products.size(), 4);
     int clangProfiles = 0;
     for (const qbs::ProductData &p : qAsConst(products)) {
         if (p.profile() == "clangProfile") {
@@ -1620,22 +1620,22 @@ void TestApi::missingSourceFile()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     qbs::ProjectData project = job->project().projectData();
-    QCOMPARE(project.allProducts().count(), 1);
+    QCOMPARE(project.allProducts().size(), 1);
     qbs::ProductData product = project.allProducts().front();
-    QCOMPARE(product.groups().count(), 1);
+    QCOMPARE(product.groups().size(), 1);
     qbs::GroupData group = product.groups().front();
-    QCOMPARE(group.allSourceArtifacts().count(), 2);
+    QCOMPARE(group.allSourceArtifacts().size(), 2);
 
     QFile::rename("file2.txt.missing", "file2.txt");
     job.reset(qbs::Project().setupProject(setupParams, m_logSink, 0));
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     project = job->project().projectData();
-    QCOMPARE(project.allProducts().count(), 1);
+    QCOMPARE(project.allProducts().size(), 1);
     product = project.allProducts().front();
-    QCOMPARE(product.groups().count(), 1);
+    QCOMPARE(product.groups().size(), 1);
     group = product.groups().front();
-    QCOMPARE(group.allSourceArtifacts().count(), 3);
+    QCOMPARE(group.allSourceArtifacts().size(), 3);
 }
 
 void TestApi::mocCppIncluded()
@@ -1686,7 +1686,7 @@ void TestApi::multiArch()
     qbs::Project project = setupJob->project();
     QCOMPARE(project.profile(), profileName());
     const QList<qbs::ProductData> &products = project.projectData().products();
-    QCOMPARE(products.count(), 3);
+    QCOMPARE(products.size(), 3);
     QList<qbs::ProductData> hostProducts;
     QList<qbs::ProductData> targetProducts;
     foreach (const qbs::ProductData &p, products) {
@@ -1697,8 +1697,8 @@ void TestApi::multiArch()
         else
             targetProducts << p;
     }
-    QCOMPARE(hostProducts.count(), 2);
-    QCOMPARE(targetProducts.count(), 1);
+    QCOMPARE(hostProducts.size(), 2);
+    QCOMPARE(targetProducts.size(), 1);
     QCOMPARE(targetProducts.front().name(), QLatin1String("p1"));
     QStringList hostProductNames
             = QStringList() << hostProducts.front().name() << hostProducts.last().name();
@@ -1870,13 +1870,13 @@ void TestApi::multiplexing()
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
 
     selector.qbsProperties["architecture"] = "C64";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
 
     selector.clear();
     selector.name = "multiplex-without-aggregator-2-depend-on-non-multiplexed";
@@ -1884,13 +1884,13 @@ void TestApi::multiplexing()
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 1);
+    QCOMPARE(product.dependencies().size(), 1);
 
     selector.qbsProperties["architecture"] = "C64";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 1);
+    QCOMPARE(product.dependencies().size(), 1);
 
     selector.clear();
     selector.name = "multiplex-without-aggregator-4";
@@ -1923,52 +1923,52 @@ void TestApi::multiplexing()
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 0);
+    QCOMPARE(product.dependencies().size(), 0);
     selector.qbsProperties["architecture"] = "TRS-80";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 0);
+    QCOMPARE(product.dependencies().size(), 0);
     selector.qbsProperties["architecture"] = "Atari ST";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
 
     selector.clear();
     selector.name = "multiplex-with-aggregator-2-dependent";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(!product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 1);
+    QCOMPARE(product.dependencies().size(), 1);
 
     selector.clear();
     selector.name = "non-multiplexed-with-dependencies-on-multiplexed";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(!product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
 
     selector.clear();
     selector.name = "non-multiplexed-with-dependencies-on-multiplexed-via-export1";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(!product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 4);
+    QCOMPARE(product.dependencies().size(), 4);
 
     selector.clear();
     selector.name = "non-multiplexed-with-dependencies-on-multiplexed-via-export2";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(!product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 3);
+    QCOMPARE(product.dependencies().size(), 3);
 
     selector.clear();
     selector.name = "non-multiplexed-with-dependencies-on-aggregation-via-export";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(!product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
 
     selector.clear();
     selector.name = "aggregate-with-dependencies-on-aggregation-via-export";
@@ -1976,17 +1976,17 @@ void TestApi::multiplexing()
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
     selector.qbsProperties["architecture"] = "TRS-80";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 2);
+    QCOMPARE(product.dependencies().size(), 2);
     selector.qbsProperties["architecture"] = "Atari ST";
     product = takeMatchingProduct(products, selector);
     QVERIFY(product.isValid());
     QVERIFY(product.isMultiplexed());
-    QCOMPARE(product.dependencies().count(), 4);
+    QCOMPARE(product.dependencies().size(), 4);
 
     QVERIFY(products.isEmpty());
 }
@@ -2094,12 +2094,12 @@ void TestApi::projectDataAfterProductInvalidation()
     QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString()));
     qbs::Project project = setupJob->project();
     QVERIFY(project.isValid());
-    QCOMPARE(project.projectData().products().count(), 1);
+    QCOMPARE(project.projectData().products().size(), 1);
     QVERIFY(project.projectData().products().front().generatedArtifacts().isEmpty());
     std::unique_ptr<qbs::BuildJob> buildJob(project.buildAllProducts(qbs::BuildOptions()));
     waitForFinished(buildJob.get());
     QVERIFY2(!buildJob->error().hasError(), qPrintable(buildJob->error().toString()));
-    QCOMPARE(project.projectData().products().count(), 1);
+    QCOMPARE(project.projectData().products().size(), 1);
     const qbs::ProductData productAfterBulding = project.projectData().products().front();
     QVERIFY(!productAfterBulding.generatedArtifacts().isEmpty());
     QFile projectFile(setupParams.projectFilePath());
@@ -2117,13 +2117,13 @@ void TestApi::projectDataAfterProductInvalidation()
     QVERIFY(!project.isValid());
     project = setupJob->project();
     QVERIFY(project.isValid());
-    QCOMPARE(project.projectData().products().count(), 1);
+    QCOMPARE(project.projectData().products().size(), 1);
     QVERIFY(project.projectData().products().front().generatedArtifacts()
             == productAfterBulding.generatedArtifacts());
     buildJob.reset(project.buildAllProducts(qbs::BuildOptions()));
     waitForFinished(buildJob.get());
     QVERIFY2(!buildJob->error().hasError(), qPrintable(buildJob->error().toString()));
-    QCOMPARE(project.projectData().products().count(), 1);
+    QCOMPARE(project.projectData().products().size(), 1);
     QVERIFY(project.projectData().products().front().generatedArtifacts()
             != productAfterBulding.generatedArtifacts());
 }
@@ -2290,7 +2290,7 @@ void TestApi::referencedFileErrors()
     if (!relaxedMode)
         return;
     const QList<qbs::ProductData> products = project.projectData().allProducts();
-    QCOMPARE(products.count(), 5);
+    QCOMPARE(products.size(), 5);
     foreach (const qbs::ProductData &p, products)
         QCOMPARE(p.isEnabled(), p.name() != "p5");
 }
@@ -2360,7 +2360,7 @@ void TestApi::references()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     const qbs::ProjectData topLevelProject = job->project().projectData();
-    QCOMPARE(topLevelProject.subProjects().count(), 1);
+    QCOMPARE(topLevelProject.subProjects().size(), 1);
     const QString subProjectFileName
             = QFileInfo(topLevelProject.subProjects().front().location().filePath()).fileName();
     QCOMPARE(subProjectFileName, QString("p.qbs"));
@@ -2375,11 +2375,11 @@ void TestApi::relaxedModeRecovery()
                                                                         m_logSink, 0));
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
-    if (m_logSink->warnings.count() != 4) {
+    if (m_logSink->warnings.size() != 4) {
         foreach (const qbs::ErrorInfo &error, m_logSink->warnings)
             qDebug() << error.toString();
     }
-    QCOMPARE(m_logSink->warnings.count(), 4);
+    QCOMPARE(m_logSink->warnings.size(), 4);
     foreach (const qbs::ErrorInfo &error, m_logSink->warnings) {
         QVERIFY2(!error.toString().contains("ASSERT")
                  && (error.toString().contains("Dependency 'blubb' not found")
@@ -2513,7 +2513,7 @@ void TestApi::restoredWarnings()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     job.reset(nullptr);
-    QCOMPARE(m_logSink->warnings.toSet().count(), 2);
+    QCOMPARE(m_logSink->warnings.toSet().size(), 2);
     foreach (const qbs::ErrorInfo &e, m_logSink->warnings) {
         const QString msg = e.toString();
         QVERIFY2(msg.contains("Superfluous version")
@@ -2527,7 +2527,7 @@ void TestApi::restoredWarnings()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     job.reset(nullptr);
-    QCOMPARE(m_logSink->warnings.toSet().count(), 2);
+    QCOMPARE(m_logSink->warnings.toSet().size(), 2);
     m_logSink->warnings.clear();
 
     // Re-resolving with changes: Errors come from the re-resolving, stored ones must be suppressed.
@@ -2538,7 +2538,7 @@ void TestApi::restoredWarnings()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     job.reset(nullptr);
-    QCOMPARE(m_logSink->warnings.toSet().count(), 3); // One more for the additional group
+    QCOMPARE(m_logSink->warnings.toSet().size(), 3); // One more for the additional group
     foreach (const qbs::ErrorInfo &e, m_logSink->warnings) {
         const QString msg = e.toString();
         QVERIFY2(msg.contains("Superfluous version")
@@ -2575,12 +2575,12 @@ void TestApi::sourceFileInBuildDir()
     waitForFinished(job.get());
     QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
     const qbs::ProjectData projectData = job->project().projectData();
-    QCOMPARE(projectData.allProducts().count(), 1);
+    QCOMPARE(projectData.allProducts().size(), 1);
     const qbs::ProductData product = projectData.allProducts().front();
     QCOMPARE(product.profile(), profileName());
     const qbs::GroupData group = findGroup(product, "the group");
     QVERIFY(group.isValid());
-    QCOMPARE(group.allFilePaths().count(), 1);
+    QCOMPARE(group.allFilePaths().size(), 1);
 }
 
 void TestApi::subProjects()
@@ -2649,7 +2649,7 @@ void TestApi::toolInModule()
     const qbs::Project project = setupJob->project();
     const qbs::ProjectData projectData = project.projectData();
     const QList<qbs::ProductData> products = projectData.products();
-    QCOMPARE(products.count(), 1);
+    QCOMPARE(products.size(), 1);
     const qbs::ProductData product = products.front();
     for (const qbs::GroupData &group : product.groups())
         QVERIFY(group.name() != "thetool binary");
diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp
index 2cd748b00..e5fd8ec57 100644
--- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp
+++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/app.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
         return 1;
     }
     const QJsonArray a = v.toArray();
-    if (a.count() != 1 || a.first() != QLatin1String("theValue")) {
+    if (a.size() != 1 || a.first() != QLatin1String("theValue")) {
         qDebug() << "value is" << v;
         return 1;
     }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index d9f21348a..283f24431 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -698,7 +698,7 @@ void TestBlackbox::dependenciesProperty()
     QJsonArray cpp_dependencies = product2_cpp.value("dependencies").toArray();
     QVERIFY(!cpp_dependencies.isEmpty());
     int qbsCount = 0;
-    for (int i = 0; i < cpp_dependencies.count(); ++i) {
+    for (int i = 0; i < cpp_dependencies.size(); ++i) {
         if (cpp_dependencies.at(i).toObject().value("name").toString() == "qbs")
             ++qbsCount;
     }
@@ -2090,7 +2090,7 @@ void TestBlackbox::responseFiles()
             << "foo" << qbs::Internal::shellQuote(QStringLiteral("with space")).toUtf8()
             << "bar" << "";
     QList<QByteArray> lines = file.readAll().split('\n');
-    for (int i = 0; i < lines.count(); ++i)
+    for (int i = 0; i < lines.size(); ++i)
         lines[i] = lines.at(i).trimmed();
     QCOMPARE(lines, expected);
 }
@@ -2253,7 +2253,7 @@ static QString soName(const QString &readElfPath, const QString &libFilePath)
     const int endIndex = output.indexOf(']', magicStringIndex);
     if (endIndex == -1)
         return QString();
-    const int nameIndex = magicStringIndex + magicString.count();
+    const int nameIndex = magicStringIndex + magicString.size();
     const QByteArray theName = output.mid(nameIndex, endIndex - nameIndex);
     return QString::fromLatin1(theName);
 }
@@ -3238,7 +3238,7 @@ void TestBlackbox::installPackage()
         if (!trimmedLine.isEmpty())
             cleanOutputLines << trimmedLine;
     }
-    QCOMPARE(cleanOutputLines.count(), 3);
+    QCOMPARE(cleanOutputLines.size(), 3);
     foreach (const QByteArray &line, cleanOutputLines) {
         QVERIFY2(line.contains("public_tool") || line.contains("mylib") || line.contains("lib.h"),
                  line.constData());
@@ -3433,7 +3433,7 @@ void TestBlackbox::jsExtensionsFile()
     QVERIFY(copy.exists());
     QVERIFY(copy.open(QIODevice::ReadOnly));
     const QList<QByteArray> lines = copy.readAll().trimmed().split('\n');
-    QCOMPARE(lines.count(), 2);
+    QCOMPARE(lines.size(), 2);
     QCOMPARE(lines.at(0).trimmed().constData(), "false");
     QCOMPARE(lines.at(1).trimmed().constData(), "true");
 }
@@ -3447,7 +3447,7 @@ void TestBlackbox::jsExtensionsFileInfo()
     QVERIFY(output.exists());
     QVERIFY(output.open(QIODevice::ReadOnly));
     const QList<QByteArray> lines = output.readAll().trimmed().split('\n');
-    QCOMPARE(lines.count(), 25);
+    QCOMPARE(lines.size(), 25);
     int i = 0;
     QCOMPARE(lines.at(i++).trimmed().constData(), "blubb");
     QCOMPARE(lines.at(i++).trimmed().constData(), "/usr/bin");
@@ -3485,7 +3485,7 @@ void TestBlackbox::jsExtensionsProcess()
     QVERIFY(output.exists());
     QVERIFY(output.open(QIODevice::ReadOnly));
     const QList<QByteArray> lines = output.readAll().trimmed().split('\n');
-    QCOMPARE(lines.count(), 8);
+    QCOMPARE(lines.size(), 8);
     QCOMPARE(lines.at(0).trimmed().constData(), "0");
     QVERIFY(lines.at(1).startsWith("qbs "));
     QCOMPARE(lines.at(2).trimmed().constData(), "true");
@@ -3548,7 +3548,7 @@ void TestBlackbox::jsExtensionsTextFile()
     QVERIFY(file2.exists());
     QVERIFY(file2.open(QIODevice::ReadOnly));
     const QList<QByteArray> lines = file2.readAll().trimmed().split('\n');
-    QCOMPARE(lines.count(), 6);
+    QCOMPARE(lines.size(), 6);
     QCOMPARE(lines.at(0).trimmed().constData(), "false");
     QCOMPARE(lines.at(1).trimmed().constData(), "First line.");
     QCOMPARE(lines.at(2).trimmed().constData(), "Second line.");
@@ -4236,7 +4236,7 @@ void TestBlackbox::productDependenciesByType()
     QFile appListFile(relativeProductBuildDir("app list") + "/app-list.txt");
     QVERIFY2(appListFile.open(QIODevice::ReadOnly), qPrintable(appListFile.fileName()));
     const QList<QByteArray> appList = appListFile.readAll().trimmed().split('\n');
-    QCOMPARE(appList.count(), 3);
+    QCOMPARE(appList.size(), 3);
     QStringList apps = QStringList()
             << QDir::currentPath() + '/' + relativeExecutableFilePath("app1")
             << QDir::currentPath() + '/' + relativeExecutableFilePath("app2")
@@ -4438,7 +4438,7 @@ void TestBlackbox::installedApp()
     // Check --no-install
     rmDirR(relativeBuildDir());
     QCOMPARE(runQbs(QbsRunParameters(QStringList() << "--no-install")), 0);
-    QCOMPARE(QDir(defaultInstallRoot).entryList(QDir::NoDotAndDotDot).count(), 0);
+    QCOMPARE(QDir(defaultInstallRoot).entryList(QDir::NoDotAndDotDot).size(), 0);
 
     // Check --no-build (with and without an existing build graph)
     QbsRunParameters params("install", QStringList() << "--no-build");
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index 9e1b30c57..673feb54b 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -98,7 +98,7 @@ void TestBlackboxAndroid::android()
                                           "modules.Android.ndk.platform:android-21" });
     params.profile = p.name();
     QCOMPARE(runQbs(params), 0);
-    for (int i = 0; i < productNames.count(); ++i) {
+    for (int i = 0; i < productNames.size(); ++i) {
         const QString productName = productNames.at(i);
         QVERIFY(m_qbsStdout.contains(productName.toLocal8Bit() + ".apk"));
         const QString apkFilePath = relativeProductBuildDir(productName)
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp
index f3b999dc6..9e2664e84 100644
--- a/tests/auto/blackbox/tst_blackboxjava.cpp
+++ b/tests/auto/blackbox/tst_blackboxjava.cpp
@@ -77,7 +77,7 @@ void TestBlackboxJava::java()
     const QStringList classFiles =
             QStringList() << "Jet" << "Ship" << "Vehicles";
     QStringList classFiles1 = QStringList(classFiles) << "io/qt/qbs/HelloWorld" << "NoPackage";
-    for (int i = 0; i < classFiles1.count(); ++i) {
+    for (int i = 0; i < classFiles1.size(); ++i) {
         QString &classFile = classFiles1[i];
         classFile = relativeProductBuildDir("class_collection") + "/classes/"
                 + classFile + ".class";
diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp
index c910362a5..1433dda3b 100644
--- a/tests/auto/blackbox/tst_clangdb.cpp
+++ b/tests/auto/blackbox/tst_clangdb.cpp
@@ -151,7 +151,7 @@ void TestClangDb::checkDbIsConsistentWithProject()
 
     // We expect only one command for now
     const QJsonArray array = doc.array();
-    QVERIFY(array.count() == 1);
+    QVERIFY(array.size() == 1);
 
     // Validate the "command object"
     const QJsonObject entry = array.at(0).toObject();
@@ -159,7 +159,7 @@ void TestClangDb::checkDbIsConsistentWithProject()
     QVERIFY(entry.value("directory").isString());
     QVERIFY(entry.contains("arguments"));
     QVERIFY(entry.value("arguments").isArray());
-    QVERIFY(entry.value("arguments").toArray().count() >= 2);
+    QVERIFY(entry.value("arguments").toArray().size() >= 2);
     QVERIFY(entry.contains("file"));
     QVERIFY(entry.value("file").isString());
     QVERIFY(entry.value("file").toString() == sourceFilePath);
@@ -171,7 +171,7 @@ void TestClangDb::checkDbIsConsistentWithProject()
     QStringList arguments;
     const QJsonArray jsonArguments = entry.value("arguments").toArray();
     QString executable = jsonArguments.at(0).toString();
-    for (int i=1; i<jsonArguments.count(); i++)
+    for (int i=1; i<jsonArguments.size(); i++)
         arguments.append(jsonArguments.at(i).toString());
     QVERIFY(runProcess(executable, arguments, stdErr, stdOut) == 0);
 }
diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
index 333d949e2..d56081cf1 100644
--- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
+++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
@@ -71,12 +71,12 @@ private slots:
         QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerTrace);
         QCOMPARE(parser.command(), BuildCommandType);
         QCOMPARE(parser.products(), QStringList() << "blubb");
-        QCOMPARE(parser.buildOptions(QString()).changedFiles().count(), 2);
+        QCOMPARE(parser.buildOptions(QString()).changedFiles().size(), 2);
         QVERIFY(parser.buildOptions(QString()).keepGoing());
         QVERIFY(parser.forceTimestampCheck());
         QVERIFY(parser.forceOutputCheck());
         QVERIFY(!parser.logTime());
-        QCOMPARE(parser.buildConfigurations().count(), 1);
+        QCOMPARE(parser.buildConfigurations().size(), 1);
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvvqqq" << m_fileArgs));
         QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), defaultLogLevel());
@@ -104,18 +104,18 @@ private slots:
 
         // Second "global" profile overwrites first.
         QVERIFY(parser.parseCommandLine(QStringList() << "profile:a" << m_fileArgs << "profile:b"));
-        QCOMPARE(parser.buildConfigurations().count(), 1);
+        QCOMPARE(parser.buildConfigurations().size(), 1);
         QCOMPARE(parser.buildConfigurations().front().value("qbs.profile").toString(), QLatin1String("b"));
 
         // Second build configuration-specific profile overwrites first.
         QVERIFY(parser.parseCommandLine(QStringList(m_fileArgs) << "config:debug" << "profile:a"
                                         << "profile:b"));
-        QCOMPARE(parser.buildConfigurations().count(), 1);
+        QCOMPARE(parser.buildConfigurations().size(), 1);
         QCOMPARE(parser.buildConfigurations().front().value("qbs.profile").toString(), QLatin1String("b"));
 
         QVERIFY(parser.parseCommandLine(QStringList(m_fileArgs) << "config:a-debug" << "profile:a"
                                         << "config:b-debug" << "profile:b"));
-        QCOMPARE(parser.buildConfigurations().count(), 2);
+        QCOMPARE(parser.buildConfigurations().size(), 2);
         QCOMPARE(parser.buildConfigurations().front().value("qbs.configurationName").toString(), QLatin1String("a-debug"));
         QCOMPARE(parser.buildConfigurations().front().value("qbs.profile").toString(), QLatin1String("a"));
         QCOMPARE(parser.buildConfigurations().at(1).value("qbs.configurationName").toString(), QLatin1String("b-debug"));
@@ -124,11 +124,11 @@ private slots:
         // Redundant build request
         QVERIFY(parser.parseCommandLine(QStringList(m_fileArgs) << "config:debug" << "profile:a"
                                         << "config:debug" << "profile:a"));
-        QCOMPARE(parser.buildConfigurations().count(), 1);
+        QCOMPARE(parser.buildConfigurations().size(), 1);
 
         QVERIFY(parser.parseCommandLine(QStringList() << "config:debug" << "profile:a"
                                         << "config:release" << "profile:b" << m_fileArgs));
-        QCOMPARE(parser.buildConfigurations().count(), 2);
+        QCOMPARE(parser.buildConfigurations().size(), 2);
         QCOMPARE(parser.buildConfigurations().front().value("qbs.configurationName").toString(), QLatin1String("debug"));
         QCOMPARE(parser.buildConfigurations().front().value("qbs.profile").toString(), QLatin1String("a"));
         QCOMPARE(parser.buildConfigurations().at(1).value("qbs.configurationName").toString(), QLatin1String("release"));
@@ -137,7 +137,7 @@ private slots:
         // Non-global property takes precedence.
         QVERIFY(parser.parseCommandLine(QStringList(m_fileArgs) << "profile:a" << "config:debug"
                                         << "profile:b"));
-        QCOMPARE(parser.buildConfigurations().count(), 1);
+        QCOMPARE(parser.buildConfigurations().size(), 1);
         QCOMPARE(parser.buildConfigurations().front().value("qbs.configurationName").toString(), QLatin1String("debug"));
         QCOMPARE(parser.buildConfigurations().front().value("qbs.profile").toString(), QLatin1String("b"));
 
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 20e0c1703..134516553 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -119,7 +119,7 @@ ResolvedModuleConstPtr TestLanguage::findModuleByName(ResolvedProductPtr product
 QVariant TestLanguage::productPropertyValue(ResolvedProductPtr product, QString propertyName)
 {
     QStringList propertyNameComponents = propertyName.split(QLatin1Char('.'));
-    if (propertyNameComponents.count() > 1)
+    if (propertyNameComponents.size() > 1)
         return product->moduleProperties->property(propertyNameComponents);
     return getConfigProperty(product->productProperties, propertyNameComponents);
 }
@@ -295,7 +295,7 @@ void TestLanguage::chainedProbes()
         parameters.setProjectFilePath(testProject("chained-probes/chained-probes.qbs"));
         const TopLevelProjectConstPtr project = loader->loadProject(parameters);
         QVERIFY(!!project);
-        QCOMPARE(project->products.count(), 1);
+        QCOMPARE(project->products.size(), 1);
         const QString prop2Val = project->products.front()->moduleProperties
                 ->moduleProperty("m", "prop2").toString();
         QCOMPARE(prop2Val, QLatin1String("probe1Valprobe2Val"));
@@ -478,7 +478,7 @@ void TestLanguage::delayedError()
         project = loader->loadProject(params);
         QCOMPARE(productEnabled, false);
         QVERIFY(!!project);
-        QCOMPARE(project->products.count(), 1);
+        QCOMPARE(project->products.size(), 1);
         const ResolvedProductConstPtr theProduct = productsFromProject(project).value("theProduct");
         QVERIFY(!!theProduct);
         QCOMPARE(theProduct->enabled, false);
@@ -519,10 +519,10 @@ void TestLanguage::dependencyOnAllProfiles()
         params.setOverriddenValues(overriddenValues);
         project = loader->loadProject(params);
         QVERIFY(!!project);
-        QCOMPARE(project->products.count(), 3);
+        QCOMPARE(project->products.size(), 3);
         const ResolvedProductConstPtr mainProduct = productsFromProject(project).value("main");
         QVERIFY(!!mainProduct);
-        QCOMPARE(mainProduct->dependencies.count(), 2);
+        QCOMPARE(mainProduct->dependencies.size(), 2);
         foreach (const ResolvedProductConstPtr &p, mainProduct->dependencies) {
             QCOMPARE(p->name, QLatin1String("dep"));
             QVERIFY(p->profile == "p1" || p->profile == "p2");
@@ -543,7 +543,7 @@ void TestLanguage::derivedSubProject()
         const TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
@@ -560,7 +560,7 @@ void TestLanguage::disabledSubProject()
         const TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 0);
+        QCOMPARE(products.size(), 0);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
@@ -577,7 +577,7 @@ void TestLanguage::emptyJsFile()
         const TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
@@ -594,11 +594,11 @@ void TestLanguage::enumerateProjectProperties()
         auto project = loader->loadProject(params);
         QVERIFY(!!project);
         auto products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
         auto product = products.values().front();
         auto files = product->groups.front()->allFiles();
-        QCOMPARE(product->groups.count(), 1);
-        QCOMPARE(files.count(), 1);
+        QCOMPARE(product->groups.size(), 1);
+        QCOMPARE(files.size(), 1);
         auto fileName = FileInfo::fileName(files.front()->absoluteFilePath);
         QCOMPARE(fileName, QString("dummy.txt"));
     } catch (const ErrorInfo &e) {
@@ -622,7 +622,7 @@ void TestLanguage::defaultValue()
         TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 2);
+        QCOMPARE(products.size(), 2);
         const ResolvedProductPtr product = products.value("egon");
         QVERIFY(!!product);
         QStringList propertyName = QStringList() << "lower" << "prop2";
@@ -694,7 +694,7 @@ void TestLanguage::errorInDisabledProduct()
         auto project = loader->loadProject(params);
         QVERIFY(!!project);
         auto products = productsFromProject(project);
-        QCOMPARE(products.count(), 4);
+        QCOMPARE(products.size(), 4);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
@@ -845,7 +845,7 @@ void TestLanguage::exports()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 22);
+        QCOMPARE(products.size(), 22);
         ResolvedProductPtr product;
         product = products.value("myapp");
         QVERIFY(!!product);
@@ -855,7 +855,7 @@ void TestLanguage::exports()
                  << "USE_MYLIB2");
         propertyName = QStringList() << "dummy" << "includePaths";
         QVariantList propertyValues = product->moduleProperties->property(propertyName).toList();
-        QCOMPARE(propertyValues.count(), 3);
+        QCOMPARE(propertyValues.size(), 3);
         QVERIFY(propertyValues.at(0).toString().endsWith("/app"));
         QVERIFY(propertyValues.at(1).toString().endsWith("/subdir/lib"));
         QVERIFY(propertyValues.at(2).toString().endsWith("/subdir2/lib"));
@@ -934,7 +934,7 @@ void TestLanguage::exports()
 
         product = products.value("depender");
         QVERIFY(!!product);
-        QCOMPARE(product->modules.count(), 2);
+        QCOMPARE(product->modules.size(), 2);
         for (const ResolvedModuleConstPtr &m : qAsConst(product->modules)) {
             QVERIFY2(m->name == QString("qbs") || m->name == QString("dependency"),
                      qPrintable(m->name));
@@ -942,7 +942,7 @@ void TestLanguage::exports()
 
         product = products.value("broken_cycle3");
         QVERIFY(!!product);
-        QCOMPARE(product->modules.count(), 3);
+        QCOMPARE(product->modules.size(), 3);
         for (const ResolvedModuleConstPtr &m : qAsConst(product->modules)) {
             QVERIFY2(m->name == QString("qbs") || m->name == QString("broken_cycle1")
                      || m->name == QString("broken_cycle2"),
@@ -1034,13 +1034,13 @@ void TestLanguage::groupConditions()
     HANDLE_INIT_CLEANUP_DATATAGS("groupconditions.qbs");
     QFETCH(int, groupCount);
     QFETCH(QList<bool>, groupEnabled);
-    QCOMPARE(groupCount, groupEnabled.count());
+    QCOMPARE(groupCount, groupEnabled.size());
     const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
     const QString productName = QString::fromLocal8Bit(QTest::currentDataTag());
     ResolvedProductPtr product = products.value(productName);
     QVERIFY(!!product);
     QCOMPARE(product->name, productName);
-    QCOMPARE(product->groups.count(), groupCount);
+    QCOMPARE(product->groups.size(), groupCount);
     for (int i = 0; i < groupCount; ++i) {
         if (product->groups.at(i)->enabled != groupEnabled.at(i)) {
             QFAIL(qPrintable(
@@ -1057,11 +1057,11 @@ void TestLanguage::groupName()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 2);
+        QCOMPARE(products.size(), 2);
 
         ResolvedProductPtr product = products.value("MyProduct");
         QVERIFY(!!product);
-        QCOMPARE(product->groups.count(), 2);
+        QCOMPARE(product->groups.size(), 2);
         GroupConstPtr group = product->groups.at(0);
         QVERIFY(!!group);
         QCOMPARE(group->name, QString("MyProduct"));
@@ -1071,7 +1071,7 @@ void TestLanguage::groupName()
 
         product = products.value("My2ndProduct");
         QVERIFY(!!product);
-        QCOMPARE(product->groups.count(), 3);
+        QCOMPARE(product->groups.size(), 3);
         group = product->groups.at(0);
         QVERIFY(!!group);
         QCOMPARE(group->name, QString("My2ndProduct"));
@@ -1096,7 +1096,7 @@ void TestLanguage::homeDirectory()
         ResolvedProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
 
         ResolvedProductPtr product = products.value("home");
         QVERIFY(!!product);
@@ -1202,7 +1202,7 @@ void TestLanguage::idUsage()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 4);
+        QCOMPARE(products.size(), 4);
         QVERIFY(products.contains("product1_1"));
         QVERIFY(products.contains("product2_2"));
         QVERIFY(products.contains("product3_3"));
@@ -1228,7 +1228,7 @@ void TestLanguage::idUniqueness()
     catch (const ErrorInfo &e) {
         exceptionCaught = true;
         const QList<ErrorItem> items = e.items();
-        QCOMPARE(items.count(), 3);
+        QCOMPARE(items.size(), 3);
         QCOMPARE(items.at(0).toString(), QString::fromUtf8("The id 'baseProduct' is not unique."));
         QVERIFY(items.at(1).toString().contains("id-uniqueness.qbs:6:5 First occurrence is here."));
         QVERIFY(items.at(2).toString().contains("id-uniqueness.qbs:9:5 Next occurrence is here."));
@@ -1263,7 +1263,7 @@ void TestLanguage::invalidBindingInDisabledItem()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 2);
+        QCOMPARE(products.size(), 2);
     }
     catch (const ErrorInfo &e) {
         exceptionCaught = true;
@@ -1380,7 +1380,7 @@ void TestLanguage::jsImportUsedInMultipleScopes()
         TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
         ResolvedProductPtr product = products.values().front();
         QVERIFY(!!product);
         QCOMPARE(product->name, expectedProductName);
@@ -1670,7 +1670,7 @@ void TestLanguage::modulePropertyOverridesPerProduct()
         const TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 3);
+        QCOMPARE(products.size(), 3);
         const ResolvedProductConstPtr a = products.value("a");
         QVERIFY(!!a);
         const ResolvedProductConstPtr b = products.value("b");
@@ -1716,7 +1716,7 @@ void TestLanguage::moduleScope()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
         ResolvedProductPtr product = products.value("product1");
         QVERIFY(!!product);
 
@@ -1837,7 +1837,7 @@ void TestLanguage::nonRequiredProducts()
         const TopLevelProjectPtr project = loader->loadProject(params);
         QVERIFY(!!project);
         const auto products = productsFromProject(project);
-        QCOMPARE(products.count(), 4 + !!subProjectEnabled);
+        QCOMPARE(products.size(), 4 + !!subProjectEnabled);
         const ResolvedProductConstPtr dependee = products.value("dependee");
         QCOMPARE(subProjectEnabled, !!dependee);
         if (dependee)
@@ -1878,21 +1878,21 @@ void TestLanguage::outerInGroup()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
         ResolvedProductPtr product = products.value("OuterInGroup");
         QVERIFY(!!product);
-        QCOMPARE(product->groups.count(), 2);
+        QCOMPARE(product->groups.size(), 2);
         GroupPtr group = product->groups.at(0);
         QVERIFY(!!group);
         QCOMPARE(group->name, product->name);
-        QCOMPARE(group->files.count(), 1);
+        QCOMPARE(group->files.size(), 1);
         SourceArtifactConstPtr artifact = group->files.front();
         QVariant installDir = artifact->properties->qbsPropertyValue("installDir");
         QCOMPARE(installDir.toString(), QString("/somewhere"));
         group = product->groups.at(1);
         QVERIFY(!!group);
         QCOMPARE(group->name, QString("Special Group"));
-        QCOMPARE(group->files.count(), 1);
+        QCOMPARE(group->files.size(), 1);
         artifact = group->files.front();
         installDir = artifact->properties->qbsPropertyValue("installDir");
         QCOMPARE(installDir.toString(), QString("/somewhere/else"));
@@ -1915,7 +1915,7 @@ void TestLanguage::overriddenPropertiesAndPrototypes()
         params.setOverriddenValues({std::make_pair("modules.qbs.targetOS", osName)});
         TopLevelProjectConstPtr project = loader->loadProject(params);
         QVERIFY(!!project);
-        QCOMPARE(project->products.count(), 1);
+        QCOMPARE(project->products.size(), 1);
         QCOMPARE(project->products.front()->moduleProperties->moduleProperty(
                      "multiple-backends", "prop").toString(), backendName);
     }
@@ -2061,7 +2061,7 @@ void TestLanguage::productConditions()
         TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 6);
+        QCOMPARE(products.size(), 6);
         ResolvedProductPtr product;
         product = products.value("product_no_condition");
         QVERIFY(!!product);
@@ -2102,7 +2102,7 @@ void TestLanguage::productDirectories()
         ResolvedProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 1);
+        QCOMPARE(products.size(), 1);
         ResolvedProductPtr product;
         product = products.value("MyApp");
         QVERIFY(!!product);
@@ -2260,7 +2260,7 @@ void TestLanguage::propertiesBlockInGroup()
         defaultParameters.setProjectFilePath(testProject("properties-block-in-group.qbs"));
         const TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
-        QCOMPARE(project->allProducts().count(), 1);
+        QCOMPARE(project->allProducts().size(), 1);
         const ResolvedProductConstPtr product = project->allProducts().front();
         const auto groupIt = std::find_if(product->groups.constBegin(), product->groups.constEnd(),
                 [](const GroupConstPtr &g) { return g->name == "the group"; });
@@ -2287,7 +2287,7 @@ void TestLanguage::propertiesItemInModule()
         const TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 2);
+        QCOMPARE(products.size(), 2);
         for (const ResolvedProductConstPtr &p : products) {
             QCOMPARE(p->moduleProperties->moduleProperty("dummy", "productName").toString(),
                      p->name);
@@ -2308,7 +2308,7 @@ void TestLanguage::propertyAssignmentInExportedGroup()
         const TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 2);
+        QCOMPARE(products.size(), 2);
         for (const ResolvedProductConstPtr &p : products) {
             QCOMPARE(p->moduleProperties->moduleProperty("dummy", "someString").toString(),
                      QString());
@@ -2337,7 +2337,7 @@ void TestLanguage::qbsPropertiesInProjectCondition()
         const TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 0);
+        QCOMPARE(products.size(), 0);
     } catch (const ErrorInfo &e) {
         exceptionCaught = true;
         qDebug() << e.toString();
@@ -2360,27 +2360,27 @@ void TestLanguage::relaxedErrorMode()
         const ResolvedProductConstPtr brokenProduct = productMap.value("broken");
         QVERIFY(!brokenProduct->enabled);
         QVERIFY(brokenProduct->location.isValid());
-        QCOMPARE(brokenProduct->allFiles().count(), 0);
+        QCOMPARE(brokenProduct->allFiles().size(), 0);
         const ResolvedProductConstPtr dependerRequired = productMap.value("depender required");
         QVERIFY(!dependerRequired->enabled);
         QVERIFY(dependerRequired->location.isValid());
-        QCOMPARE(dependerRequired->allFiles().count(), 1);
+        QCOMPARE(dependerRequired->allFiles().size(), 1);
         const ResolvedProductConstPtr dependerNonRequired
                 = productMap.value("depender nonrequired");
         QVERIFY(dependerNonRequired->enabled);
-        QCOMPARE(dependerNonRequired->allFiles().count(), 1);
+        QCOMPARE(dependerNonRequired->allFiles().size(), 1);
         const ResolvedProductConstPtr recursiveDepender = productMap.value("recursive depender");
         QVERIFY(!recursiveDepender->enabled);
         QVERIFY(recursiveDepender->location.isValid());
-        QCOMPARE(recursiveDepender->allFiles().count(), 1);
+        QCOMPARE(recursiveDepender->allFiles().size(), 1);
         const ResolvedProductConstPtr missingFile = productMap.value("missing file");
         QVERIFY(missingFile->enabled);
-        QCOMPARE(missingFile->groups.count(), 1);
+        QCOMPARE(missingFile->groups.size(), 1);
         QVERIFY(missingFile->groups.front()->enabled);
-        QCOMPARE(missingFile->groups.front()->allFiles().count(), 2);
+        QCOMPARE(missingFile->groups.front()->allFiles().size(), 2);
         const ResolvedProductConstPtr fine = productMap.value("fine");
         QVERIFY(fine->enabled);
-        QCOMPARE(fine->allFiles().count(), 1);
+        QCOMPARE(fine->allFiles().size(), 1);
     } catch (const ErrorInfo &e) {
         QVERIFY2(strictMode, qPrintable(e.toString()));
     }
@@ -2455,11 +2455,11 @@ void TestLanguage::qualifiedId()
 {
     QString str = "foo.bar.baz";
     QualifiedId id = QualifiedId::fromString(str);
-    QCOMPARE(id.count(), 3);
+    QCOMPARE(id.size(), 3);
     QCOMPARE(id.toString(), str);
 
     id = QualifiedId("blubb.di.blubb"); // c'tor does not split
-    QCOMPARE(id.count(), 1);
+    QCOMPARE(id.size(), 1);
 
     QList<QualifiedId> ids;
     ids << QualifiedId::fromString("a")
@@ -2482,7 +2482,7 @@ void TestLanguage::recursiveProductDependencies()
         const TopLevelProjectPtr project = loader->loadProject(defaultParameters);
         QVERIFY(!!project);
         const QHash<QString, ResolvedProductPtr> products = productsFromProject(project);
-        QCOMPARE(products.count(), 4);
+        QCOMPARE(products.size(), 4);
         const ResolvedProductConstPtr p1 = products.value("p1");
         QVERIFY(!!p1);
         const ResolvedProductConstPtr p2 = products.value("p2");
@@ -2526,10 +2526,10 @@ void TestLanguage::fileTags()
     ResolvedProductPtr product;
     const QString productName = QString::fromLocal8Bit(QTest::currentDataTag());
     QVERIFY(!!(product = products.value(productName)));
-    QCOMPARE(product->groups.count(), numberOfGroups);
+    QCOMPARE(product->groups.size(), numberOfGroups);
     GroupPtr group = product->groups.last();
     QVERIFY(!!group);
-    QCOMPARE(group->files.count(), 1);
+    QCOMPARE(group->files.size(), 1);
     SourceArtifactConstPtr sourceFile = group->files.front();
     QStringList fileTags = sourceFile->fileTags.toStringList();
     fileTags.sort();
@@ -2744,7 +2744,7 @@ void TestLanguage::wildcards()
         QVERIFY(!!product);
         GroupPtr group;
         if (useGroup) {
-            QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 3 : 2);
+            QCOMPARE(product->groups.size(), HostOsInfo::isMacosHost() ? 3 : 2);
             foreach (const GroupPtr &rg, product->groups) {
                 if (rg->name == groupName) {
                     group = rg;
@@ -2752,18 +2752,18 @@ void TestLanguage::wildcards()
                 }
             }
         } else {
-            QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 2 : 1);
+            QCOMPARE(product->groups.size(), HostOsInfo::isMacosHost() ? 2 : 1);
             group = product->groups.front();
         }
         QVERIFY(!!group);
-        QCOMPARE(group->files.count(), 0);
+        QCOMPARE(group->files.size(), 0);
         QVERIFY(!!group->wildcards);
         QStringList actualFilePaths;
         foreach (const SourceArtifactConstPtr &artifact, group->wildcards->files) {
             QString str = artifact->absoluteFilePath;
             int idx = str.indexOf(m_wildcardsTestDirPath);
             if (idx != -1)
-                str.remove(0, idx + m_wildcardsTestDirPath.count() + 1);
+                str.remove(0, idx + m_wildcardsTestDirPath.size() + 1);
             actualFilePaths << str;
         }
         actualFilePaths.sort();
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index b29e2007c..84d9caad3 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -401,11 +401,11 @@ void TestTools::testBuildConfigMerging()
     const ErrorInfo error = params.expandBuildConfiguration();
     QVERIFY2(!error.hasError(), qPrintable(error.toString()));
     const QVariantMap finalMap = params.finalBuildConfigurationTree();
-    QCOMPARE(finalMap.count(), 3);
+    QCOMPARE(finalMap.size(), 3);
     QCOMPARE(finalMap.value(QLatin1String("topLevelKey")).toString(),
              QString::fromLatin1("topLevelValue"));
     const QVariantMap finalQbsMap = finalMap.value(QLatin1String("qbs")).toMap();
-    QCOMPARE(finalQbsMap.count(), 4);
+    QCOMPARE(finalQbsMap.size(), 4);
     QCOMPARE(finalQbsMap.value(QLatin1String("toolchain")).toString(),
              QString::fromLatin1("clang"));
     QCOMPARE(finalQbsMap.value(QLatin1String("configurationName")).toString(),
@@ -414,7 +414,7 @@ void TestTools::testBuildConfigMerging()
              QString::fromLatin1("Jean-Claude Pillemann"));
     QCOMPARE(finalQbsMap.value(QLatin1String("installRoot")).toString(), QLatin1String("/blubb"));
     const QVariantMap finalCppMap = finalMap.value(QLatin1String("cpp")).toMap();
-    QCOMPARE(finalCppMap.count(), 1);
+    QCOMPARE(finalCppMap.size(), 1);
     QCOMPARE(finalCppMap.value(QLatin1String("treatWarningsAsErrors")).toBool(), true);
 }
 
@@ -515,37 +515,37 @@ void TestTools::set_size()
     Set<int> set;
     QVERIFY(set.size() == 0);
     QVERIFY(set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.insert(1);
     QVERIFY(set.size() == 1);
     QVERIFY(!set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.insert(1);
     QVERIFY(set.size() == 1);
     QVERIFY(!set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.insert(2);
     QVERIFY(set.size() == 2);
     QVERIFY(!set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.remove(1);
     QVERIFY(set.size() == 1);
     QVERIFY(!set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.remove(1);
     QVERIFY(set.size() == 1);
     QVERIFY(!set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 
     set.remove(2);
     QVERIFY(set.size() == 0);
     QVERIFY(set.isEmpty());
-    QVERIFY(set.count() == set.size());
+    QVERIFY(set.size() == set.size());
 }
 
 void TestTools::set_capacity()
@@ -1037,7 +1037,7 @@ void TestTools::set_makeSureTheComfortFunctionsCompile()
 void TestTools::set_initializerList()
 {
     Set<int> set = {1, 1, 2, 3, 4, 5};
-    QCOMPARE(set.count(), 5);
+    QCOMPARE(set.size(), 5);
     QVERIFY(set.contains(1));
     QVERIFY(set.contains(2));
     QVERIFY(set.contains(3));
@@ -1046,7 +1046,7 @@ void TestTools::set_initializerList()
 
     // check _which_ of the equal elements gets inserted (in the QHash/QMap case, it's the last):
     const Set<IdentityTracker> set2 = {{1, 0}, {1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}};
-    QCOMPARE(set2.count(), 5);
+    QCOMPARE(set2.size(), 5);
     const int dummy = -1;
     const IdentityTracker searchKey = {1, dummy};
     QCOMPARE(set2.find(searchKey)->id, 0);