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

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

    const std::string o = "object";

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

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

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

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

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

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

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

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

10 files changed, 72 insertions, 72 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index f5f0d2619c..9e36cad887 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -87,7 +87,7 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &t)
     for(int pb_subdir = 0; pb_subdir < pb_subdirs.size(); ++pb_subdir) {
         ProjectBuilderSubDirs *pb = pb_subdirs[pb_subdir];
         const ProStringList &subdirs = pb->project->values("SUBDIRS");
-        for(int subdir = 0; subdir < subdirs.count(); subdir++) {
+        for(int subdir = 0; subdir < subdirs.size(); subdir++) {
             ProString tmpk = subdirs[subdir];
             const ProKey fkey(tmpk + ".file");
             if (!pb->project->isEmpty(fkey)) {
@@ -329,7 +329,7 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &t)
     t << "\t\t\tprojectReferences = (\n";
     {
         const ProStringList &qmake_subdirs = project->values("QMAKE_PBX_SUBDIRS");
-        for(int i = 0; i < qmake_subdirs.count(); i++) {
+        for(int i = 0; i < qmake_subdirs.size(); i++) {
             const ProString &subdir = qmake_subdirs[i];
             t << "\t\t\t\t{\n"
               << "\t\t\t\t\t" << writeSettings("ProductGroup", keyFor(subdir + "_PRODUCTGROUP")) << ";\n"
@@ -658,7 +658,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 
         const QStringList &files = fileFixify(sources.at(source).files(project),
                                               FileFixifyFromOutdir | FileFixifyAbsolute);
-        for(int f = 0; f < files.count(); ++f) {
+        for(int f = 0; f < files.size(); ++f) {
             QString file = files[f];
             if(!sources.at(source).compilerName().isNull() &&
                !verifyExtraCompiler(sources.at(source).compilerName(), file))
@@ -873,7 +873,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                                              "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
         for (int i = 0; libs[i]; i++) {
             tmp = project->values(libs[i]);
-            for(int x = 0; x < tmp.count();) {
+            for(int x = 0; x < tmp.size();) {
                 bool libSuffixReplaced = false;
                 bool remove = false;
                 QString library, name;
@@ -912,7 +912,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                     if(opt.size() > 2) {
                         r = opt.mid(2).toQString();
                     } else {
-                        if(x == tmp.count()-1)
+                        if(x == tmp.size()-1)
                             break;
                         r = tmp[++x].toQString();
                     }
@@ -921,12 +921,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                         frameworkdirs.append(r);
                     }
                 } else if(opt == "-framework") {
-                    if(x == tmp.count()-1)
+                    if(x == tmp.size()-1)
                         break;
                     const ProString &framework = tmp[x+1];
                     ProStringList fdirs = frameworkdirs;
                     fdirs << "/System/Library/Frameworks/" << "/Library/Frameworks/";
-                    for(int fdir = 0; fdir < fdirs.count(); fdir++) {
+                    for(int fdir = 0; fdir < fdirs.size(); fdir++) {
                         if(exists(fdirs[fdir] + QDir::separator() + framework + ".framework")) {
                             remove = true;
                             library = fdirs[fdir] + Option::dir_sep + framework + ".framework";
@@ -1008,12 +1008,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
             mkt << "SUBLIBS= ";
             // ### This is missing the parametrization found in unixmake2.cpp
             tmp = project->values("SUBLIBS");
-            for(int i = 0; i < tmp.count(); i++)
+            for(int i = 0; i < tmp.size(); i++)
                 t << escapeFilePath("tmp/lib" + tmp[i] + ".a") << ' ';
             t << Qt::endl << Qt::endl;
             mkt << "sublibs: $(SUBLIBS)\n\n";
             tmp = project->values("SUBLIBS");
-            for(int i = 0; i < tmp.count(); i++)
+            for(int i = 0; i < tmp.size(); i++)
                 t << escapeFilePath("tmp/lib" + tmp[i] + ".a") + ":\n\t"
                   << var(ProKey("MAKELIB" + tmp[i])) << Qt::endl << Qt::endl;
             mkt.flush();
@@ -1148,7 +1148,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 
         //all bundle data
         const ProStringList &bundle_data = project->values("QMAKE_BUNDLE_DATA");
-        for(int i = 0; i < bundle_data.count(); i++) {
+        for(int i = 0; i < bundle_data.size(); i++) {
             ProStringList bundle_files;
             ProString path = project->first(ProKey(bundle_data[i] + ".path"));
             const bool isEmbeddedFramework = ((!osx && path == QLatin1String("Frameworks"))
@@ -1158,7 +1158,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 
             //all files
             const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files"));
-            for(int file = 0; file < files.count(); file++) {
+            for(int file = 0; file < files.size(); file++) {
                 QString fn = fileFixify(files[file].toQString(), FileFixifyAbsolute);
                 QString name = fn.split(Option::dir_sep).back();
                 QString file_ref_key = keyFor("QMAKE_PBX_BUNDLE_DATA_FILE_REF." + bundle_data[i] + "-" + fn);
@@ -1684,7 +1684,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                     t << "\t\t\t\t" << writeSettings("CODE_SIGN_IDENTITY", project->first("QMAKE_XCODE_CODE_SIGN_IDENTITY")) << ";\n";
 
                 tmp = project->values("QMAKE_PBX_VARS");
-                for (int i = 0; i < tmp.count(); i++) {
+                for (int i = 0; i < tmp.size(); i++) {
                     QString var = tmp[i].toQString(), val = QString::fromLocal8Bit(qgetenv(var.toLatin1().constData()));
                     if (val.isEmpty() && var == "TB")
                         val = "/usr/bin/";
@@ -1888,7 +1888,7 @@ ProStringList
 ProjectBuilderMakefileGenerator::fixListForOutput(const ProStringList &l)
 {
     ProStringList ret;
-    for(int i = 0; i < l.count(); i++)
+    for(int i = 0; i < l.size(); i++)
         ret += fixForOutput(l[i].toQString());
     return ret;
 }
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index f705a9bfee..60d96f13db 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -39,7 +39,7 @@ using namespace QMakeInternal;
 bool MakefileGenerator::canExecute(const QStringList &cmdline, int *a) const
 {
     int argv0 = -1;
-    for(int i = 0; i < cmdline.count(); ++i) {
+    for(int i = 0; i < cmdline.size(); ++i) {
         if(!cmdline.at(i).contains('=')) {
             argv0 = i;
             break;
@@ -238,7 +238,7 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString
 {
     ProStringList vpath;
     const ProValueMap &v = project->variables();
-    for(int val_it = 0; val_it < l.count(); ) {
+    for(int val_it = 0; val_it < l.size(); ) {
         bool remove_file = false;
         ProString &val = l[val_it];
         if(!val.isEmpty()) {
@@ -304,7 +304,7 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString
                     } else {
                         l.removeAt(val_it);
                         QString a;
-                        for(int i = (int)files.count()-1; i >= 0; i--) {
+                        for(int i = (int)files.size()-1; i >= 0; i--) {
                             a = real_dir + files[i];
                             if(!(flags & VPATH_NoFixify))
                                 a = fileFixify(a);
@@ -468,12 +468,12 @@ MakefileGenerator::init()
                     continue;
                 }
                 const ProStringList &tinn = v[innkey], &toutn = v[outnkey];
-                if (tinn.length() != 1) {
+                if (tinn.size() != 1) {
                     warn_msg(WarnLogic, "Substitute '%s.input' does not have exactly one value",
                              sub.toLatin1().constData());
                     continue;
                 }
-                if (toutn.length() != 1) {
+                if (toutn.size() != 1) {
                     warn_msg(WarnLogic, "Substitute '%s.output' does not have exactly one value",
                              sub.toLatin1().constData());
                     continue;
@@ -639,7 +639,7 @@ MakefileGenerator::init()
                 paths << compilers.at(x).variable_in;
         }
         paths << "INCLUDEPATH" << "QMAKE_INTERNAL_INCLUDED_FILES" << "PRECOMPILED_HEADER";
-        for(int y = 0; y < paths.count(); y++) {
+        for(int y = 0; y < paths.size(); y++) {
             ProStringList &l = v[paths[y].toKey()];
             for (ProStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                 if((*it).isEmpty())
@@ -827,7 +827,7 @@ MakefileGenerator::init()
                             warn_msg(WarnLogic, "Dependency for [%s]: Not found %s", (*file_it).toLatin1().constData(),
                                      dep.toLatin1().constData());
                         } else {
-                            for(int i = 0; i < files.count(); i++)
+                            for(int i = 0; i < files.size(); i++)
                                 out_deps.append(dir + files[i]);
                         }
                     }
@@ -1316,7 +1316,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, bool noBuild)
                     inst << cmd;
                     uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst_dir + filestr, FileFixifyAbsolute, false))));
                 }
-                for(int x = 0; x < files.count(); x++) {
+                for(int x = 0; x < files.size(); x++) {
                     QString file = files[x];
                     uninst.append(rm_dir_contents + " " + escapeFilePath(filePrefixRoot(root, fileFixify(dst_dir + file, FileFixifyAbsolute, false))));
                     QFileInfo fi(fileInfo(dirstr + file));
@@ -1883,7 +1883,7 @@ void MakefileGenerator::callExtraCompilerDependCommand(const ProString &extraCom
             return;
         QDir outDir(Option::output_dir);
         QStringList dep_cmd_deps = splitDeps(indeps, dep_lines);
-        for (int i = 0; i < dep_cmd_deps.count(); ++i) {
+        for (int i = 0; i < dep_cmd_deps.size(); ++i) {
             QString &file = dep_cmd_deps[i];
             const QString absFile = outDir.absoluteFilePath(file);
             if (absFile == file) {
@@ -2850,7 +2850,7 @@ MakefileGenerator::fixLibFlags(const ProKey &var)
     const ProStringList &in = project->values(var);
     ProStringList ret;
 
-    ret.reserve(in.length());
+    ret.reserve(in.size());
     for (const ProString &v : in)
         ret << fixLibFlag(v);
     return ret;
@@ -3538,7 +3538,7 @@ MakefileGenerator::LinkerResponseFileInfo MakefileGenerator::maybeCreateLinkerRe
         // When using QMAKE_LINK_OBJECT_MAX, the number of object files (regardless of their path
         // length) decides whether to use a response file.  This is far from being a useful
         // heuristic but let's keep this behavior for backwards compatibility.
-        if (linkerInputs.count() < threshold)
+        if (linkerInputs.size() < threshold)
             return {};
     } else {
         // When using QMAKE_REPONSEFILE_THRESHOLD, try to determine the command line length of the
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index febb993ddd..c9235509f2 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -73,12 +73,12 @@ BuildsMetaMakefileGenerator::init()
 
     const ProStringList &builds = project->values("BUILDS");
     bool use_single_build = builds.isEmpty();
-    if(builds.count() > 1 && Option::output.fileName() == "-") {
+    if(builds.size() > 1 && Option::output.fileName() == "-") {
         use_single_build = true;
         warn_msg(WarnLogic, "Cannot direct to stdout when using multiple BUILDS.");
     }
     if(!use_single_build) {
-        for(int i = 0; i < builds.count(); i++) {
+        for(int i = 0; i < builds.size(); i++) {
             ProString build = builds[i];
             MakefileGenerator *makefile = processBuild(build);
             if(!makefile)
@@ -91,7 +91,7 @@ BuildsMetaMakefileGenerator::init()
             } else {
                 Build *b = new Build;
                 b->name = name;
-                if(builds.count() != 1)
+                if(builds.size() != 1)
                     b->build = build.toQString();
                 b->makefile = makefile;
                 makefiles += b;
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index ede5df496f..96d7b26370 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -54,7 +54,7 @@ ProjectGenerator::init()
             dirs.prepend(qmake_getpwd());
         }
 
-        for(int i = 0; i < dirs.count(); ++i) {
+        for(int i = 0; i < dirs.size(); ++i) {
             QString dir, regex, pd = dirs.at(i);
             bool add_depend = false;
             if(exists(pd)) {
@@ -66,7 +66,7 @@ ProjectGenerator::init()
                         dir += Option::dir_sep;
                     if (Option::recursive) {
                         QStringList files = QDir(dir).entryList(QDir::Files);
-                        for (int i = 0; i < files.count(); i++)
+                        for (int i = 0; i < files.size(); i++)
                             dirs.append(dir + files[i] + QDir::separator() + builtin_regex);
                     }
                     regex = builtin_regex;
@@ -92,11 +92,11 @@ ProjectGenerator::init()
                 const QDir d(dir);
                 if (Option::recursive) {
                     QStringList entries = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-                    for (int i = 0; i < entries.count(); i++)
+                    for (int i = 0; i < entries.size(); i++)
                         dirs.append(dir + entries[i] + QDir::separator() + regex);
                 }
                 QStringList files = d.entryList(QDir::nameFiltersFromString(regex));
-                for(int i = 0; i < (int)files.count(); i++) {
+                for(int i = 0; i < (int)files.size(); i++) {
                     QString file = d.absoluteFilePath(files[i]);
                     if (addFile(file)) {
                         add_depend = true;
@@ -116,7 +116,7 @@ ProjectGenerator::init()
         if(Option::projfile::do_pwd)
             knownDirs.prepend(".");
         const QString out_file = fileFixify(Option::output.fileName());
-        for(int i = 0; i < knownDirs.count(); ++i) {
+        for(int i = 0; i < knownDirs.size(); ++i) {
             QString pd = knownDirs.at(i);
             if(exists(pd)) {
                 QString newdir = pd;
@@ -129,7 +129,7 @@ ProjectGenerator::init()
                         subdirs.append(newdir);
                     } else {
                         QStringList profiles = QDir(newdir).entryList(QStringList("*" + Option::pro_ext), QDir::Files);
-                        for(int i = 0; i < (int)profiles.count(); i++) {
+                        for(int i = 0; i < (int)profiles.size(); i++) {
                             QString nd = newdir;
                             if(nd == ".")
                                 nd = "";
@@ -143,7 +143,7 @@ ProjectGenerator::init()
                     }
                     if (Option::recursive) {
                         QStringList dirs = QDir(newdir).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-                        for(int i = 0; i < (int)dirs.count(); i++) {
+                        for(int i = 0; i < (int)dirs.size(); i++) {
                             QString nd = fileFixify(newdir + QDir::separator() + dirs[i]);
                             if (!knownDirs.contains(nd, Qt::CaseInsensitive))
                                 knownDirs.append(nd);
@@ -160,7 +160,7 @@ ProjectGenerator::init()
                 QStringList files = QDir(dir).entryList(QDir::nameFiltersFromString(regx),
                                                         QDir::Dirs | QDir::NoDotAndDotDot);
                 ProStringList &subdirs = v["SUBDIRS"];
-                for(int i = 0; i < (int)files.count(); i++) {
+                for(int i = 0; i < (int)files.size(); i++) {
                     QString newdir(dir + files[i]);
                     QFileInfo fi(fileInfo(newdir));
                     {
@@ -170,7 +170,7 @@ ProjectGenerator::init()
                            subdirs.append(newdir);
                         } else {
                             QStringList profiles = QDir(newdir).entryList(QStringList("*" + Option::pro_ext), QDir::Files);
-                            for(int i = 0; i < (int)profiles.count(); i++) {
+                            for(int i = 0; i < (int)profiles.size(); i++) {
                                 QString nd = newdir + QDir::separator() + files[i];
                                 fileFixify(nd);
                                 if(files[i] != "." && files[i] != ".." && !subdirs.contains(nd, Qt::CaseInsensitive)) {
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 8532a90364..6bd1a8340e 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -852,7 +852,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         //copy other data
         if(!project->isEmpty("QMAKE_BUNDLE_DATA")) {
             const ProStringList &bundle_data = project->values("QMAKE_BUNDLE_DATA");
-            for(int i = 0; i < bundle_data.count(); i++) {
+            for(int i = 0; i < bundle_data.size(); i++) {
                 const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files"));
                 QString path = bundle_dir;
                 const ProKey pkey(bundle_data[i] + ".path");
@@ -872,7 +872,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                 }
                 path += project->first(pkey).toQString();
                 path = Option::fixPathToTargetOS(path);
-                for(int file = 0; file < files.count(); file++) {
+                for(int file = 0; file < files.size(); file++) {
                     QString fn = files.at(file).toQString();
                     QString src = fileFixify(fn, FileFixifyAbsolute);
                     if (!QFile::exists(src))
@@ -1560,9 +1560,9 @@ bool UnixMakefileGenerator::writeObjectsPart(QTextStream &t, bool do_incremental
             if (!increment)
                 t << "\\\n\t\t" << (*objit);
         }
-        if (incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
+        if (incrs_out.size() == objs.size()) { //we just switched places, no real incrementals to be done!
             t << escapeFilePaths(incrs_out).join(QString(" \\\n\t\t")) << Qt::endl;
-        } else if (!incrs_out.count()) {
+        } else if (!incrs_out.size()) {
             t << Qt::endl;
         } else {
             src_incremental = true;
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 630f054e41..7f798a2cc6 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -250,7 +250,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t)
     if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
         t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET) 2>" << var("QMAKE_SHELL_NULL_DEVICE");
         const ProString &objmax = project->first("QMAKE_LINK_OBJECT_MAX");
-        if (objmax.isEmpty() || project->values("OBJECTS").count() < objmax.toInt()) {
+        if (objmax.isEmpty() || project->values("OBJECTS").size() < objmax.toInt()) {
             t << "\n\t$(LIB) $(DESTDIR_TARGET) " << objectsLinkLine << " " ;
         } else {
             t << "\n\t" << objectsLinkLine << " " ;
@@ -273,7 +273,7 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
     ProStringList rcIncPaths = project->values("RC_INCLUDEPATH");
     rcIncPaths.prepend(fileInfo(rc_file).path());
     QString incPathStr;
-    for (int i = 0; i < rcIncPaths.count(); ++i) {
+    for (int i = 0; i < rcIncPaths.size(); ++i) {
         const ProString &path = rcIncPaths.at(i);
         if (path.isEmpty())
             continue;
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index ce4a80b6c8..7cbb44dde4 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -283,7 +283,7 @@ static QString commandLinesForOutput(QStringList commands)
     // As we want every sub-command to be error-checked (as is done by makefile-based
     // backends), we insert the checks ourselves, using the undocumented jump target.
     static QString errchk = QStringLiteral("if errorlevel 1 goto VCEnd");
-    for (int i = commands.count() - 2; i >= 0; --i) {
+    for (int i = commands.size() - 2; i >= 0; --i) {
         if (!commands.at(i).startsWith("rem", Qt::CaseInsensitive))
             commands.insert(i + 1, errchk);
     }
@@ -301,7 +301,7 @@ static QStringList unquote(const QStringList &values)
 {
     QStringList result;
     result.reserve(values.size());
-    for (int i = 0; i < values.count(); ++i)
+    for (int i = 0; i < values.size(); ++i)
         result << unquote(values.at(i));
     return result;
 }
@@ -544,7 +544,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
                    [] (const VCFilter &filter) { return filter.Name; });
     tempProj.ExtraCompilers.removeDuplicates();
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x)
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x)
         addFilters(tempProj, xmlFilter, tempProj.ExtraCompilers.at(x));
 
     xmlFilter << closetag();
@@ -559,7 +559,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
     outputFilter(tempProj, xml, xmlFilter, "Deployment Files");
     outputFilter(tempProj, xml, xmlFilter, "Distribution Files");
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x) {
         outputFilter(tempProj, xml, xmlFilter, tempProj.ExtraCompilers.at(x));
     }
 
@@ -774,7 +774,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
     addFilters(tool, xmlFilter, "Deployment Files");
     addFilters(tool, xmlFilter, "Distribution Files");
 
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x)
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x)
         addFilters(tool, xmlFilter, tool.ExtraCompilers.at(x));
 
     xmlFilter << closetag();
@@ -788,7 +788,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
     outputFilter(tool, xml, xmlFilter, "Resource Files");
     outputFilter(tool, xml, xmlFilter, "Deployment Files");
     outputFilter(tool, xml, xmlFilter, "Distribution Files");
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x) {
         outputFilter(tool, xml, xmlFilter, tool.ExtraCompilers.at(x));
     }
     outputFilter(tool, xml, xmlFilter, "Root Files");
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 660ac24af9..5878686828 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1539,7 +1539,7 @@ bool VCLinkerTool::parseOption(const char* option)
         {
             QStringList both = QString(option+6).split(",");
             HeapReserveSize = both[0].toLongLong();
-            if(both.count() == 2)
+            if(both.size() == 2)
                 HeapCommitSize = both[1].toLongLong();
         }
         break;
@@ -1728,7 +1728,7 @@ bool VCLinkerTool::parseOption(const char* option)
         {
             QStringList both = QString(option+7).split(",");
             StackReserveSize = both[0].toLongLong();
-            if(both.count() == 2)
+            if(both.size() == 2)
                 StackCommitSize = both[1].toLongLong();
         }
         break;
@@ -2231,13 +2231,13 @@ void VCFilter::addFile(const VCFilterFile& fileInfo)
 
 void VCFilter::addFiles(const QStringList& fileList)
 {
-    for (int i = 0; i < fileList.count(); ++i)
+    for (int i = 0; i < fileList.size(); ++i)
         addFile(fileList.at(i));
 }
 
 void VCFilter::addFiles(const ProStringList& fileList)
 {
-    for (int i = 0; i < fileList.count(); ++i)
+    for (int i = 0; i < fileList.size(); ++i)
         addFile(fileList.at(i).toQString());
 }
 
@@ -2342,7 +2342,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
     CustomBuildTool.ToolPath.clear();
     CustomBuildTool.ToolName = QLatin1String(_VCCustomBuildTool);
 
-    for (int x = 0; x < extraCompilers.count(); ++x) {
+    for (int x = 0; x < extraCompilers.size(); ++x) {
         const QString &extraCompilerName = extraCompilers.at(x);
 
         if (!Project->verifyExtraCompiler(extraCompilerName, inFile) && !hasBuiltIn)
@@ -2387,7 +2387,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
                                                     configs.contains("dep_existing_only"),
                                                     true  /* checkCommandAvailability */);
         }
-        for (int i = 0; i < deps.count(); ++i)
+        for (int i = 0; i < deps.size(); ++i)
             deps[i] = Option::fixPathToTargetOS(
                         Project->replaceExtraCompilerVariables(
                                 deps.at(i), inFile, out, MakefileGenerator::NoShell),
@@ -2396,9 +2396,9 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         if (combined) {
             // Add dependencies for each file
             const ProStringList &tmp_in = Project->project->values(ProKey(extraCompilerName + ".input"));
-            for (int a = 0; a < tmp_in.count(); ++a) {
+            for (int a = 0; a < tmp_in.size(); ++a) {
                 const ProStringList &files = Project->project->values(tmp_in.at(a).toKey());
-                for (int b = 0; b < files.count(); ++b) {
+                for (int b = 0; b < files.size(); ++b) {
                     QString file = files.at(b).toQString();
                     deps += Project->findDependencies(file);
                     inputs += Option::fixPathToTargetOS(file, false);
@@ -2432,7 +2432,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         }
 
         // Fixify paths
-        for (int i = 0; i < deps.count(); ++i)
+        for (int i = 0; i < deps.size(); ++i)
             deps[i] = Option::fixPathToTargetOS(deps[i], false);
 
 
@@ -2450,7 +2450,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
         deps += CustomBuildTool.AdditionalDependencies;
         // Make sure that all deps are only once
         QStringList uniqDeps;
-        for (int c = 0; c < deps.count(); ++c) {
+        for (int c = 0; c < deps.size(); ++c) {
             QString aDep = deps.at(c);
             if (!aDep.isEmpty())
                 uniqDeps << aDep;
@@ -2496,7 +2496,7 @@ const VCFilter &VCProjectSingleConfig::filterByName(const QString &name) const
 
 const VCFilter &VCProjectSingleConfig::filterForExtraCompiler(const QString &compilerName) const
 {
-    for (int i = 0; i < ExtraCompilersFiles.count(); ++i)
+    for (int i = 0; i < ExtraCompilersFiles.size(); ++i)
         if (ExtraCompilersFiles.at(i).Name == compilerName)
             return ExtraCompilersFiles.at(i);
 
@@ -2576,7 +2576,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
     outputFilter(tempProj, xml, "Distribution Files");
 
     QSet<QString> extraCompilersInProject;
-    for (int i = 0; i < tool.ExtraCompilersFiles.count(); ++i) {
+    for (int i = 0; i < tool.ExtraCompilersFiles.size(); ++i) {
         const QString &compilerName = tool.ExtraCompilersFiles.at(i).Name;
         if (!extraCompilersInProject.contains(compilerName)) {
             extraCompilersInProject += compilerName;
@@ -2584,7 +2584,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProjectSingleConfig &tool)
         }
     }
 
-    for (int x = 0; x < tempProj.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tempProj.ExtraCompilers.size(); ++x) {
         outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x));
     }
     outputFilter(tempProj, xml, "Root Files");
@@ -2628,7 +2628,7 @@ void VCProjectWriter::write(XmlOutput &xml, VCProject &tool)
     outputFilter(tool, xml, "Resource Files");
     outputFilter(tool, xml, "Deployment Files");
     outputFilter(tool, xml, "Distribution Files");
-    for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
+    for (int x = 0; x < tool.ExtraCompilers.size(); ++x) {
         outputFilter(tool, xml, tool.ExtraCompilers.at(x));
     }
     outputFilter(tool, xml, "Root Files");
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5dd1532d57..ac50253a44 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -152,7 +152,7 @@ bool VcprojGenerator::writeProjectMakefile()
         for (int i = 0; i < mergedProjects.size(); ++i) {
             VCProjectSingleConfig *singleProject = &(mergedProjects.at(i)->vcProject);
             mergedProject.SingleProjects += *singleProject;
-            for (int j = 0; j < singleProject->ExtraCompilersFiles.count(); ++j) {
+            for (int j = 0; j < singleProject->ExtraCompilersFiles.size(); ++j) {
                 const QString &compilerName = singleProject->ExtraCompilersFiles.at(j).Name;
                 if (!mergedProject.ExtraCompilers.contains(compilerName))
                     mergedProject.ExtraCompilers += compilerName;
@@ -634,10 +634,10 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
 bool VcprojGenerator::hasBuiltinCompiler(const QString &file)
 {
     // Source files
-    for (int i = 0; i < Option::cpp_ext.count(); ++i)
+    for (int i = 0; i < Option::cpp_ext.size(); ++i)
         if (file.endsWith(Option::cpp_ext.at(i)))
             return true;
-    for (int i = 0; i < Option::c_ext.count(); ++i)
+    for (int i = 0; i < Option::c_ext.size(); ++i)
         if (file.endsWith(Option::c_ext.at(i)))
             return true;
     if (file.endsWith(".rc")
@@ -767,8 +767,8 @@ void VcprojGenerator::init()
         if (autogenPrecompSource) {
             precompSource = precompH
                     + (pchIsCFile
-                       ? (Option::c_ext.count() ? Option::c_ext.at(0) : QLatin1String(".c"))
-                       : (Option::cpp_ext.count() ? Option::cpp_ext.at(0) : QLatin1String(".cpp")));
+                       ? (Option::c_ext.size() ? Option::c_ext.at(0) : QLatin1String(".c"))
+                       : (Option::cpp_ext.size() ? Option::cpp_ext.at(0) : QLatin1String(".cpp")));
             project->values("GENERATED_SOURCES") += precompSource;
         } else if (!precompSource.isEmpty()) {
             project->values("SOURCES") += precompSource;
@@ -1553,7 +1553,7 @@ void VcprojGenerator::initExtraCompilerOutputs()
             } else if (!inputVars.isEmpty()) {
                 // One output file per input
                 const ProStringList &tmp_in = project->values(inputVars.first().toKey());
-                for (int i = 0; i < tmp_in.count(); ++i) {
+                for (int i = 0; i < tmp_in.size(); ++i) {
                     const QString &filename = tmp_in.at(i).toQString();
                     if (extraCompilerSources.contains(filename) && !otherFiltersContain(filename))
                         extraCompile.addFile(Option::fixPathToTargetOS(
@@ -1568,7 +1568,7 @@ void VcprojGenerator::initExtraCompilerOutputs()
             for (const ProString &inputVar : inputVars) {
                 if (!otherFilters.contains(inputVar)) {
                     const ProStringList &tmp_in = project->values(inputVar.toKey());
-                    for (int i = 0; i < tmp_in.count(); ++i) {
+                    for (int i = 0; i < tmp_in.size(); ++i) {
                         const QString &filename = tmp_in.at(i).toQString();
                         if (extraCompilerSources.contains(filename) && !otherFiltersContain(filename))
                             extraCompile.addFile(Option::fixPathToTargetOS(
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 5ae4d095c7..c8317389f5 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -174,9 +174,9 @@ bool Win32MakefileGenerator::processPrlFileBase(QString &origFile, QStringView o
 {
     if (MakefileGenerator::processPrlFileBase(origFile, origName, fixedBase, slashOff))
         return true;
-    for (int off = fixedBase.length(); off > slashOff; off--) {
+    for (int off = fixedBase.size(); off > slashOff; off--) {
         if (!fixedBase.at(off - 1).isDigit()) {
-            if (off != fixedBase.length()) {
+            if (off != fixedBase.size()) {
                 return MakefileGenerator::processPrlFileBase(
                             origFile, origName, fixedBase.left(off), slashOff);
             }
@@ -686,7 +686,7 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
 
         const ProStringList rcIncPaths = project->values("RC_INCLUDEPATH");
         QString incPathStr;
-        for (int i = 0; i < rcIncPaths.count(); ++i) {
+        for (int i = 0; i < rcIncPaths.size(); ++i) {
             const ProString &path = rcIncPaths.at(i);
             if (path.isEmpty())
                 continue;