Port from qAsConst() to std::as_const()

We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: I234704ba429750ddee958a82f6c941d041da0653
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

19 files changed, 62 insertions, 62 deletions

diff --git a/src/linguist/lconvert/main.cpp b/src/linguist/lconvert/main.cpp
index 72ee551d1..da2868ee8 100644
--- a/src/linguist/lconvert/main.cpp
+++ b/src/linguist/lconvert/main.cpp
@@ -20,7 +20,7 @@ static int usage(const QStringList &args)
 
     QString loaders;
     QString line(QLatin1String("    %1 - %2\n"));
-    for (const Translator::FileFormat &format : qAsConst(Translator::registeredFileFormats()))
+    for (const Translator::FileFormat &format : std::as_const(Translator::registeredFileFormats()))
         loaders += line.arg(format.extension, -5).arg(format.description());
 
     std::cout << qPrintable(QStringLiteral("\nUsage:\n"
diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp
index dcd14843a..49e58b813 100644
--- a/src/linguist/linguist/formpreviewview.cpp
+++ b/src/linguist/linguist/formpreviewview.cpp
@@ -182,7 +182,7 @@ static void buildTargets(QObject *o, TargetsHash *targets)
 
 static void destroyTargets(TargetsHash *targets)
 {
-    for (const auto &targetList : qAsConst(*targets))
+    for (const auto &targetList : std::as_const(*targets))
         for (const TranslatableEntry &target : targetList)
             if (target.type == TranslatableProperty)
                 delete target.prop.name;
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 28803049e..17b8d46e8 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -624,7 +624,7 @@ bool MainWindow::openFiles(const QStringList &names, bool globalReadWrite)
                 {
                     case QMessageBox::Cancel:
                         delete dm;
-                        for (const OpenedFile &op : qAsConst(opened))
+                        for (const OpenedFile &op : std::as_const(opened))
                             delete op.dataModel;
                         return false;
                     case QMessageBox::Yes:
@@ -644,13 +644,13 @@ bool MainWindow::openFiles(const QStringList &names, bool globalReadWrite)
             waitCursor = false;
         }
         if (!closeAll()) {
-            for (const OpenedFile &op : qAsConst(opened))
+            for (const OpenedFile &op : std::as_const(opened))
                 delete op.dataModel;
             return false;
         }
     }
 
-    for (const OpenedFile &op : qAsConst(opened)) {
+    for (const OpenedFile &op : std::as_const(opened)) {
         if (op.langGuessed) {
             if (waitCursor) {
                 QApplication::restoreOverrideCursor();
@@ -668,7 +668,7 @@ bool MainWindow::openFiles(const QStringList &names, bool globalReadWrite)
     m_contextView->setUpdatesEnabled(false);
     m_messageView->setUpdatesEnabled(false);
     int totalCount = 0;
-    for (const OpenedFile &op : qAsConst(opened)) {
+    for (const OpenedFile &op : std::as_const(opened)) {
         m_phraseDict.append(QHash<QString, QList<Phrase *> >());
         m_dataModel->append(op.dataModel, op.readWrite);
         if (op.readWrite)
@@ -732,7 +732,7 @@ static QString fileFilters(bool allFirst)
     static const QString pattern(QLatin1String("%1 (*.%2);;"));
     QStringList allExtensions;
     QString filter;
-    for (const Translator::FileFormat &format : qAsConst(Translator::registeredFileFormats())) {
+    for (const Translator::FileFormat &format : std::as_const(Translator::registeredFileFormats())) {
         if (format.fileType == Translator::FileFormat::TranslationSource && format.priority >= 0) {
             filter.append(pattern.arg(format.description(), format.extension));
             allExtensions.append(QLatin1String("*.") + format.extension);
@@ -1163,7 +1163,7 @@ void MainWindow::newPhraseBook()
 
 bool MainWindow::isPhraseBookOpen(const QString &name)
 {
-    for (const PhraseBook *pb : qAsConst(m_phraseBooks)) {
+    for (const PhraseBook *pb : std::as_const(m_phraseBooks)) {
         if (pb->fileName() == name)
             return true;
     }
@@ -1260,7 +1260,7 @@ void MainWindow::addToPhraseBook()
 {
     QStringList phraseBookList;
     QHash<QString, PhraseBook *> phraseBookHash;
-    for (PhraseBook *pb : qAsConst(m_phraseBooks)) {
+    for (PhraseBook *pb : std::as_const(m_phraseBooks)) {
         if (pb->language() != QLocale::C && m_dataModel->language(m_currentIndex.model()) != QLocale::C) {
             if (pb->language() != m_dataModel->language(m_currentIndex.model()))
                 continue;
@@ -2354,7 +2354,7 @@ bool MainWindow::maybeSavePhraseBook(PhraseBook *pb)
 
 bool MainWindow::maybeSavePhraseBooks()
 {
-    for (PhraseBook *phraseBook : qAsConst(m_phraseBooks))
+    for (PhraseBook *phraseBook : std::as_const(m_phraseBooks))
         if (!maybeSavePhraseBook(phraseBook))
             return false;
     return true;
@@ -2395,7 +2395,7 @@ void MainWindow::updatePhraseDictInternal(int model)
     QHash<QString, QList<Phrase *> > &pd = m_phraseDict[model];
 
     pd.clear();
-    for (PhraseBook *pb : qAsConst(m_phraseBooks)) {
+    for (PhraseBook *pb : std::as_const(m_phraseBooks)) {
         bool before;
         if (pb->language() != QLocale::C && m_dataModel->language(model) != QLocale::C) {
             if (pb->language() != m_dataModel->language(model))
@@ -2543,7 +2543,7 @@ void MainWindow::updateDanger(const MultiDataIndex &index, bool verbose)
                 QStringList lookupWords = fsource.split(QLatin1Char(' '));
 
                 bool phraseFound;
-                for (const QString &s : qAsConst(lookupWords)) {
+                for (const QString &s : std::as_const(lookupWords)) {
                     if (m_phraseDict[mi].contains(s)) {
                         phraseFound = true;
                         const auto phrases = m_phraseDict[mi].value(s);
@@ -2603,7 +2603,7 @@ void MainWindow::updateDanger(const MultiDataIndex &index, bool verbose)
                     }
                 }
 
-                for (int i : qAsConst(placeMarkerIndexes)) {
+                for (int i : std::as_const(placeMarkerIndexes)) {
                     if (i != 0) {
                         if (verbose)
                             m_errorsView->addError(mi, ErrorsView::PlaceMarkersDiffer);
diff --git a/src/linguist/linguist/messageeditor.cpp b/src/linguist/linguist/messageeditor.cpp
index 3939ada5a..ee4a5c70b 100644
--- a/src/linguist/linguist/messageeditor.cpp
+++ b/src/linguist/linguist/messageeditor.cpp
@@ -192,7 +192,7 @@ void MessageEditor::messageModelAppended()
 
 void MessageEditor::allModelsDeleted()
 {
-    for (const MessageEditorData &med : qAsConst(m_editors))
+    for (const MessageEditorData &med : std::as_const(m_editors))
         med.container->deleteLater();
     m_editors.clear();
     m_currentModel = -1;
@@ -293,7 +293,7 @@ void MessageEditor::fixTabOrder()
 void MessageEditor::reallyFixTabOrder()
 {
     QWidget *prev = this;
-    for (const MessageEditorData &med : qAsConst(m_editors)) {
+    for (const MessageEditorData &med : std::as_const(m_editors)) {
         for (FormMultiWidget *fmw : med.transTexts)
             for (QTextEdit *te : fmw->getEditors()) {
                 setTabOrder(prev, te);
@@ -549,7 +549,7 @@ void MessageEditor::showNothing()
     m_commentText->clearTranslation();
     for (int j = 0; j < m_editors.size(); ++j) {
         setEditingEnabled(j, false);
-        for (FormMultiWidget *widget : qAsConst(m_editors[j].transTexts))
+        for (FormMultiWidget *widget : std::as_const(m_editors[j].transTexts))
             widget->clearTranslation();
         m_editors[j].transCommentText->clearTranslation();
     }
@@ -664,7 +664,7 @@ void MessageEditor::setTranslation(int latestModel, const QString &translation)
 void MessageEditor::setEditingEnabled(int model, bool enabled)
 {
     MessageEditorData &ed = m_editors[model];
-    for (FormMultiWidget *widget : qAsConst(ed.transTexts))
+    for (FormMultiWidget *widget : std::as_const(ed.transTexts))
         widget->setEditingEnabled(enabled);
     ed.transCommentText->setEditingEnabled(enabled);
 
@@ -676,7 +676,7 @@ void MessageEditor::setEditingEnabled(int model, bool enabled)
 void MessageEditor::setLengthVariants(bool on)
 {
     m_lengthVariants = on;
-    for (const MessageEditorData &ed : qAsConst(m_editors))
+    for (const MessageEditorData &ed : std::as_const(m_editors))
         for (FormMultiWidget *widget : ed.transTexts)
             widget->setMultiEnabled(on);
 }
@@ -863,7 +863,7 @@ void MessageEditor::setVisualizeWhitespace(bool value)
     m_pluralSource->getEditor()->setVisualizeWhitespace(value);
     m_commentText->getEditor()->setVisualizeWhitespace(value);
 
-    for (const MessageEditorData &med : qAsConst(m_editors)) {
+    for (const MessageEditorData &med : std::as_const(m_editors)) {
         med.transCommentText->getEditor()->setVisualizeWhitespace(value);
         for (FormMultiWidget *widget : med.transTexts)
             for (FormatTextEdit *te : widget->getEditors())
@@ -893,7 +893,7 @@ void MessageEditor::applyFontSize()
     m_pluralSource->getEditor()->setFont(font);
     m_commentText->getEditor()->setFont(font);
 
-    for (const MessageEditorData &med : qAsConst(m_editors)) {
+    for (const MessageEditorData &med : std::as_const(m_editors)) {
         for (FormMultiWidget *fmw : med.transTexts)
             for (QTextEdit *te : fmw->getEditors())
                 te->setFont(font);
diff --git a/src/linguist/linguist/phrase.cpp b/src/linguist/linguist/phrase.cpp
index d10fc8bb2..ac9153f07 100644
--- a/src/linguist/linguist/phrase.cpp
+++ b/src/linguist/linguist/phrase.cpp
@@ -251,7 +251,7 @@ bool PhraseBook::save(const QString &fileName)
     if (language() != QLocale::C)
         t << " language=\"" << Translator::makeLanguageCode(language(), country()) << '"';
     t << ">\n";
-    for (Phrase *p : qAsConst(m_phrases)) {
+    for (Phrase *p : std::as_const(m_phrases)) {
         t << "<phrase>\n";
         t << "    <source>" << protect( p->source() ) << "</source>\n";
         t << "    <target>" << protect( p->target() ) << "</target>\n";
diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp
index 83ad442d2..354f67daf 100644
--- a/src/linguist/lprodump/main.cpp
+++ b/src/linguist/lprodump/main.cpp
@@ -179,7 +179,7 @@ static QStringList getSources(const ProFileEvaluator &visitor, const QString &pr
                          + visitor.values(QLatin1String("DEPLOYMENT"));
     installs.removeDuplicates();
     QDir baseDir(projectDir);
-    for (const QString &inst : qAsConst(installs)) {
+    for (const QString &inst : std::as_const(installs)) {
         for (const QString &file : visitor.values(inst + QLatin1String(".files"))) {
             QFileInfo info(file);
             if (!info.isAbsolute())
@@ -267,7 +267,7 @@ static QJsonObject processProject(const QString &proFile, const QStringList &tra
         excludeProjects(visitor, &subProjects);
         QStringList subProFiles;
         QDir proDir(proPath);
-        for (const QString &subdir : qAsConst(subProjects)) {
+        for (const QString &subdir : std::as_const(subProjects)) {
             QString realdir = visitor.value(subdir + QLatin1String(".subdir"));
             if (realdir.isEmpty())
                 realdir = visitor.value(subdir + QLatin1String(".file"));
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index b4b5d11dc..86fc7066d 100644
--- a/src/linguist/lrelease/main.cpp
+++ b/src/linguist/lrelease/main.cpp
@@ -130,7 +130,7 @@ static bool releaseTsFile(const QString& tsFileName,
         return false;
 
     QString qmFileName = tsFileName;
-    for (const Translator::FileFormat &fmt : qAsConst(Translator::registeredFileFormats())) {
+    for (const Translator::FileFormat &fmt : std::as_const(Translator::registeredFileFormats())) {
         if (qmFileName.endsWith(QLatin1Char('.') + fmt.extension)) {
             qmFileName.chop(fmt.extension.size() + 1);
             break;
@@ -260,7 +260,7 @@ int main(int argc, char **argv)
         inputFiles = translationsFromProjects(projectDescription);
     }
 
-    for (const QString &inputFile : qAsConst(inputFiles)) {
+    for (const QString &inputFile : std::as_const(inputFiles)) {
         if (outputFile.isEmpty()) {
             if (!releaseTsFile(inputFile, cd, removeIdentical))
                 return 1;
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 0526b4c0e..a851dc843 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -1214,7 +1214,7 @@ void CppFiles::addIncludeCycle(const QSet<QString> &fileNames)
     }
     qDeleteAll(intersectingCycles);
 
-    for (const QString &fileName : qAsConst(cycle->fileNames))
+    for (const QString &fileName : std::as_const(cycle->fileNames))
         includeCycles().insert(fileName, cycle);
 }
 
@@ -1229,7 +1229,7 @@ void CppParser::processInclude(const QString &file, ConversionData &cd, const QS
 {
     QString cleanFile = QDir::cleanPath(file);
 
-    for (const QString &ex : qAsConst(cd.m_excludes)) {
+    for (const QString &ex : std::as_const(cd.m_excludes)) {
         QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(ex));
         if (rx.match(cleanFile).hasMatch())
             return;
@@ -1274,7 +1274,7 @@ void CppParser::processInclude(const QString &file, ConversionData &cd, const QS
     inclusions.insert(cleanFile);
     if (isIndirect) {
         CppParser parser;
-        for (const QString &projectRoot : qAsConst(cd.m_projectRoots))
+        for (const QString &projectRoot : std::as_const(cd.m_projectRoots))
             if (cleanFile.startsWith(projectRoot)) {
                 parser.setTranslator(new Translator);
                 break;
@@ -1680,7 +1680,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
                     processInclude(cSource, cd, includeStack, inclusions);
                 goto incOk;
             }
-            for (const QString &incPath : qAsConst(cd.m_includePath)) {
+            for (const QString &incPath : std::as_const(cd.m_includePath)) {
                 text = QDir(incPath).absoluteFilePath(yyWord);
                 text.detach();
                 if (QFileInfo(text).isFile()) {
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index b4dfff6a4..740d5f406 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -503,7 +503,7 @@ static void expandQrcFiles(Project &project)
 
 static bool processTs(Translator &fetchedTor, const QString &file, ConversionData &cd)
 {
-    for (const Translator::FileFormat &fmt : qAsConst(Translator::registeredFileFormats())) {
+    for (const Translator::FileFormat &fmt : std::as_const(Translator::registeredFileFormats())) {
         if (file.endsWith(QLatin1Char('.') + fmt.extension, Qt::CaseInsensitive)) {
             Translator tor;
             if (tor.load(file, cd, fmt.extension)) {
@@ -944,9 +944,9 @@ int main(int argc, char **argv)
             files << arg;
         }
         if (metTsFlag) {
-            for (const QString &file : qAsConst(files)) {
+            for (const QString &file : std::as_const(files)) {
                 bool found = false;
-                for (const Translator::FileFormat &fmt : qAsConst(Translator::registeredFileFormats())) {
+                for (const Translator::FileFormat &fmt : std::as_const(Translator::registeredFileFormats())) {
                     if (file.endsWith(QLatin1Char('.') + fmt.extension, Qt::CaseInsensitive)) {
                         QFileInfo fi(file);
                         if (!fi.exists() || fi.isWritable()) {
@@ -969,7 +969,7 @@ int main(int argc, char **argv)
         } else if (metXTsFlag) {
             alienFiles += files;
         } else {
-            for (const QString &file : qAsConst(files)) {
+            for (const QString &file : std::as_const(files)) {
                 QFileInfo fi(file);
                 if (!fi.exists()) {
                     printErr(QStringLiteral("lupdate error: File '%1' does not exist.\n").arg(file));
@@ -997,7 +997,7 @@ int main(int argc, char **argv)
                     QFileInfoList fileinfolist;
                     recursiveFileInfoList(dir, extensionsNameFilters, filters, &fileinfolist);
                     int scanRootLen = dir.absolutePath().size();
-                    for (const QFileInfo &fi : qAsConst(fileinfolist)) {
+                    for (const QFileInfo &fi : std::as_const(fileinfolist)) {
                         QString fn = QDir::cleanPath(fi.absoluteFilePath());
                         if (fn.endsWith(QLatin1String(".qrc"), Qt::CaseInsensitive)) {
                             resourceFiles << fn;
@@ -1080,7 +1080,7 @@ int main(int argc, char **argv)
         cd.m_allCSources = allCSources;
         cd.m_compilationDatabaseDir = commandLineCompilationDatabaseDir;
         cd.m_rootDirs = rootDirs;
-        for (const QString &resource : qAsConst(resourceFiles))
+        for (const QString &resource : std::as_const(resourceFiles))
             sourceFiles << getResources(resource);
         processSources(fetchedTor, sourceFiles, cd, &fail);
         updateTsFiles(fetchedTor, tsFileNames, alienFiles,
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp
index ba69e017c..3a0742c53 100644
--- a/src/linguist/shared/po.cpp
+++ b/src/linguist/shared/po.cpp
@@ -548,7 +548,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd)
             msg.setTranslatorComment(toUnicode(item.translatorComments));
             msg.setPlural(item.isPlural || item.msgStr.size() > 1);
             QStringList translations;
-            for (const QByteArray &bstr : qAsConst(item.msgStr)) {
+            for (const QByteArray &bstr : std::as_const(item.msgStr)) {
                 QString str = toUnicode(bstr);
                 str.replace(QChar(Translator::TextVariantSeparator),
                             QChar(Translator::BinaryVariantSeparator));
@@ -741,7 +741,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &)
     if (qtContexts)
         addPoHeader(headers, hdrOrder, "X-Qt-Contexts", QLatin1String("true"));
     QString hdrStr;
-    for (const QString &hdr : qAsConst(hdrOrder)) {
+    for (const QString &hdr : std::as_const(hdrOrder)) {
         hdrStr += hdr;
         hdrStr += QLatin1String(": ");
         hdrStr += headers.value(makePoHeader(hdr));
diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
index 33094005a..da051b813 100644
--- a/src/linguist/shared/qm.cpp
+++ b/src/linguist/shared/qm.cpp
@@ -263,7 +263,7 @@ void Releaser::squeeze(TranslatorSaveMode mode)
 {
     m_dependencyArray.clear();
     QDataStream depstream(&m_dependencyArray, QIODevice::WriteOnly);
-    for (const QString &dep : qAsConst(m_dependencies))
+    for (const QString &dep : std::as_const(m_dependencies))
         depstream << dep;
 
     if (m_messages.isEmpty() && mode == SaveEverything)
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index de4514e66..358176658 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -546,7 +546,7 @@ void QMakeEvaluator::populateDeps(
             if (depends.isEmpty()) {
                 rootSet.insert(first(ProKey(prefix + item + priosfx)).toInt(), item);
             } else {
-                for (const ProString &dep : qAsConst(depends)) {
+                for (const ProString &dep : std::as_const(depends)) {
                     dset.insert(dep.toKey());
                     dependees[dep.toKey()] << item;
                 }
@@ -703,7 +703,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
     }
     case E_NUM_ADD: {
         qlonglong sum = 0;
-        for (const ProString &arg : qAsConst(args)) {
+        for (const ProString &arg : std::as_const(args)) {
             if (arg.contains(QLatin1Char('.'))) {
                 evalError(fL1S("num_add(): floats are currently not supported."));
                 goto allfail;
@@ -1103,7 +1103,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
             rootSet.erase(it);
             if ((func_t == E_RESOLVE_DEPENDS) || orgList.contains(item))
                 ret.prepend(item);
-            for (const ProString &dep : qAsConst(dependees[item.toKey()])) {
+            for (const ProString &dep : std::as_const(dependees[item.toKey()])) {
                 QSet<ProKey> &dset = dependencies[dep.toKey()];
                 dset.remove(item.toKey());
                 if (dset.isEmpty())
@@ -1114,11 +1114,11 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
     }
     case E_ENUMERATE_VARS: {
         QSet<ProString> keys;
-        for (const ProValueMap &vmap : qAsConst(m_valuemapStack))
+        for (const ProValueMap &vmap : std::as_const(m_valuemapStack))
             for (ProValueMap::ConstIterator it = vmap.constBegin(); it != vmap.constEnd(); ++it)
                 keys.insert(it.key());
         ret.reserve(keys.size());
-        for (const ProString &key : qAsConst(keys))
+        for (const ProString &key : std::as_const(keys))
             ret << key;
         break; }
     case E_SHADOWED: {
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp
index 444260101..d4cb8aad7 100644
--- a/src/linguist/shared/qmakeevaluator.cpp
+++ b/src/linguist/shared/qmakeevaluator.cpp
@@ -1233,7 +1233,7 @@ bool QMakeEvaluator::loadSpec()
         qmakespec = m_hostBuild ? QLatin1String("default-host") : QLatin1String("default");
 #endif
     if (IoUtils::isRelativePath(qmakespec)) {
-        for (const QString &root : qAsConst(m_mkspecPaths)) {
+        for (const QString &root : std::as_const(m_mkspecPaths)) {
             QString mkspec = root + QLatin1Char('/') + qmakespec;
             if (IoUtils::exists(mkspec)) {
                 qmakespec = mkspec;
@@ -1475,7 +1475,7 @@ void QMakeEvaluator::updateMkspecPaths()
     for (const QString &it : paths)
         ret << it + concat;
 
-    for (const QString &it : qAsConst(m_qmakepath))
+    for (const QString &it : std::as_const(m_qmakepath))
         ret << it + concat;
 
     if (!m_buildRoot.isEmpty())
@@ -1516,7 +1516,7 @@ void QMakeEvaluator::updateFeaturePaths()
     for (const QString &item : items)
         feature_bases << (item + mkspecs_concat);
 
-    for (const QString &item : qAsConst(m_qmakepath))
+    for (const QString &item : std::as_const(m_qmakepath))
         feature_bases << (item + mkspecs_concat);
 
     if (!m_qmakespec.isEmpty()) {
@@ -1538,7 +1538,7 @@ void QMakeEvaluator::updateFeaturePaths()
     feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/get")) + mkspecs_concat);
     feature_bases << (m_option->propertyValue(ProKey("QT_HOST_DATA/src")) + mkspecs_concat);
 
-    for (const QString &fb : qAsConst(feature_bases)) {
+    for (const QString &fb : std::as_const(feature_bases)) {
         const auto sfxs = values(ProKey("QMAKE_PLATFORM"));
         for (const ProString &sfx : sfxs)
             feature_roots << (fb + features_concat + sfx + QLatin1Char('/'));
@@ -1552,7 +1552,7 @@ void QMakeEvaluator::updateFeaturePaths()
     feature_roots.removeDuplicates();
 
     QStringList ret;
-    for (const QString &root : qAsConst(feature_roots))
+    for (const QString &root : std::as_const(feature_roots))
         if (IoUtils::exists(root))
             ret << root;
     m_featureRoots = new QMakeFeatureRoots(ret);
diff --git a/src/linguist/shared/qmakeglobals.cpp b/src/linguist/shared/qmakeglobals.cpp
index 91e7c3bb9..e05d33c7c 100644
--- a/src/linguist/shared/qmakeglobals.cpp
+++ b/src/linguist/shared/qmakeglobals.cpp
@@ -168,7 +168,7 @@ void QMakeGlobals::commitCommandLineArguments(QMakeCmdLineParserState &state)
 {
     if (!state.extraargs.isEmpty()) {
         QString extra = fL1S("QMAKE_EXTRA_ARGS =");
-        for (const QString &ea : qAsConst(state.extraargs))
+        for (const QString &ea : std::as_const(state.extraargs))
             extra += QLatin1Char(' ') + QMakeEvaluator::quoteValue(ProString(ea));
         state.cmds[QMakeEvalBefore] << extra;
     }
diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp
index 6ef2bae11..5b799b5eb 100644
--- a/src/linguist/shared/qmakeparser.cpp
+++ b/src/linguist/shared/qmakeparser.cpp
@@ -27,7 +27,7 @@ ProFileCache::ProFileCache()
 
 ProFileCache::~ProFileCache()
 {
-    for (const Entry &ent : qAsConst(parsed_files))
+    for (const Entry &ent : std::as_const(parsed_files))
         if (ent.pro)
             ent.pro->deref();
     QMakeVfs::deref();
diff --git a/src/linguist/shared/translator.cpp b/src/linguist/shared/translator.cpp
index 18325c61e..75772d9f6 100644
--- a/src/linguist/shared/translator.cpp
+++ b/src/linguist/shared/translator.cpp
@@ -187,7 +187,7 @@ void Translator::appendSorted(const TranslatorMessage &msg)
     // Working vars
     int prevLine = 0;
     int curIdx = 0;
-    for (const TranslatorMessage &mit : qAsConst(m_messages)) {
+    for (const TranslatorMessage &mit : std::as_const(m_messages)) {
         bool sameFile = mit.fileName() == msg.fileName() && mit.context() == msg.context();
         int curLine;
         if (sameFile && (curLine = mit.lineNumber()) >= prevLine) {
@@ -232,7 +232,7 @@ static QString guessFormat(const QString &filename, const QString &format)
     if (format != QLatin1String("auto"))
         return format;
 
-    for (const Translator::FileFormat &fmt : qAsConst(Translator::registeredFileFormats())) {
+    for (const Translator::FileFormat &fmt : std::as_const(Translator::registeredFileFormats())) {
         if (filename.endsWith(QLatin1Char('.') + fmt.extension, Qt::CaseInsensitive))
             return fmt.extension;
     }
@@ -269,7 +269,7 @@ bool Translator::load(const QString &filename, ConversionData &cd, const QString
 
     QString fmt = guessFormat(filename, format);
 
-    for (const FileFormat &format : qAsConst(registeredFileFormats())) {
+    for (const FileFormat &format : std::as_const(registeredFileFormats())) {
         if (fmt == format.extension) {
             if (format.loader)
                 return (*format.loader)(*this, file, cd);
@@ -310,7 +310,7 @@ bool Translator::save(const QString &filename, ConversionData &cd, const QString
     QString fmt = guessFormat(filename, format);
     cd.m_targetDir = QFileInfo(filename).absoluteDir();
 
-    for (const FileFormat &format : qAsConst(registeredFileFormats())) {
+    for (const FileFormat &format : std::as_const(registeredFileFormats())) {
         if (fmt == format.extension) {
             if (format.saver)
                 return (*format.saver)(*this, file, cd);
@@ -703,7 +703,7 @@ void Translator::normalizeTranslations(ConversionData &cd)
 QString Translator::guessLanguageCodeFromFileName(const QString &filename)
 {
     QString str = filename;
-    for (const FileFormat &format : qAsConst(registeredFileFormats())) {
+    for (const FileFormat &format : std::as_const(registeredFileFormats())) {
         if (str.endsWith(format.extension)) {
             str = str.left(str.size() - format.extension.size() - 1);
             break;
diff --git a/src/linguist/shared/translatormessage.cpp b/src/linguist/shared/translatormessage.cpp
index df99c462c..95fbb0aac 100644
--- a/src/linguist/shared/translatormessage.cpp
+++ b/src/linguist/shared/translatormessage.cpp
@@ -49,7 +49,7 @@ void TranslatorMessage::addReferenceUniq(const QString &fileName, int lineNumber
         if (fileName == m_fileName && lineNumber == m_lineNumber)
             return;
         if (!m_extraRefs.isEmpty()) { // Rather common case, so special-case it
-            for (const Reference &ref : qAsConst(m_extraRefs)) {
+            for (const Reference &ref : std::as_const(m_extraRefs)) {
                 if (fileName == ref.fileName() && lineNumber == ref.lineNumber())
                     return;
             }
diff --git a/src/linguist/shared/ts.cpp b/src/linguist/shared/ts.cpp
index 0040daf23..d2b37c735 100644
--- a/src/linguist/shared/ts.cpp
+++ b/src/linguist/shared/ts.cpp
@@ -457,7 +457,7 @@ static void writeExtras(QTextStream &t, const char *indent,
         }
     }
     outs.sort();
-    for (const QString &out : qAsConst(outs))
+    for (const QString &out : std::as_const(outs))
         t << indent << out << Qt::endl;
 }
 
@@ -533,12 +533,12 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd)
 
     QHash<QString, int> currentLine;
     QString currentFile;
-    for (const QString &context : qAsConst(contextOrder)) {
+    for (const QString &context : std::as_const(contextOrder)) {
         t << "<context>\n"
              "    <name>"
           << protect(context)
           << "</name>\n";
-        for (const TranslatorMessage &msg : qAsConst(messageOrder[context])) {
+        for (const TranslatorMessage &msg : std::as_const(messageOrder[context])) {
             //msg.dump();
 
                 t << "    <message";
diff --git a/src/linguist/shared/xliff.cpp b/src/linguist/shared/xliff.cpp
index 1d0d9e490..a0e728d7a 100644
--- a/src/linguist/shared/xliff.cpp
+++ b/src/linguist/shared/xliff.cpp
@@ -767,7 +767,7 @@ bool saveXLIFF(const Translator &translator, QIODevice &dev, ConversionData &cd)
         sourceLanguageCode.replace(QLatin1Char('_'), QLatin1Char('-'));
     QString languageCode = translator.languageCode();
     languageCode.replace(QLatin1Char('_'), QLatin1Char('-'));
-    for (const QString &fn : qAsConst(fileOrder)) {
+    for (const QString &fn : std::as_const(fileOrder)) {
         writeIndent(ts, indent);
         ts << "<file original=\"" << fn << "\""
             << " datatype=\"" << dataType(messageOrder[fn].cbegin()->first()) << "\""
@@ -776,7 +776,7 @@ bool saveXLIFF(const Translator &translator, QIODevice &dev, ConversionData &cd)
             << "><body>\n";
         ++indent;
 
-        for (const QString &ctx : qAsConst(contextOrder[fn])) {
+        for (const QString &ctx : std::as_const(contextOrder[fn])) {
             if (!ctx.isEmpty()) {
                 writeIndent(ts, indent);
                 ts << "<group restype=\"" << restypeContext << "\""
@@ -784,7 +784,7 @@ bool saveXLIFF(const Translator &translator, QIODevice &dev, ConversionData &cd)
                 ++indent;
             }
 
-            for (const TranslatorMessage &msg : qAsConst(messageOrder[fn][ctx]))
+            for (const TranslatorMessage &msg : std::as_const(messageOrder[fn][ctx]))
                 writeMessage(ts, msg, drops, indent);
 
             if (!ctx.isEmpty()) {