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>

102 files changed, 284 insertions, 284 deletions

diff --git a/examples/assistant/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp
index 567f81f51..69e9b2d06 100644
--- a/examples/assistant/simpletextviewer/assistant.cpp
+++ b/examples/assistant/simpletextviewer/assistant.cpp
@@ -45,7 +45,7 @@ QString documentationDirectory()
     paths.append(QLibraryInfo::path(QLibraryInfo::ExamplesPath));
     paths.append(QCoreApplication::applicationDirPath());
     paths.append(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation));
-    for (const auto &dir : qAsConst(paths)) {
+    for (const auto &dir : std::as_const(paths)) {
         const QString path = dir + QLatin1String("/documentation");
         if (QFileInfo::exists(path))
             return path;
diff --git a/src/assistant/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp
index 420964a26..e34f7fcc8 100644
--- a/src/assistant/assistant/bookmarkdialog.cpp
+++ b/src/assistant/assistant/bookmarkdialog.cpp
@@ -130,7 +130,7 @@ void BookmarkDialog::accepted()
 void BookmarkDialog::rejected()
 {
     TRACE_OBJ
-    for (const QPersistentModelIndex &index : qAsConst(cache))
+    for (const QPersistentModelIndex &index : std::as_const(cache))
         bookmarkModel->removeItem(index);
     reject();
 }
diff --git a/src/assistant/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index 5dcc08fbf..46557a7d9 100644
--- a/src/assistant/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
@@ -103,7 +103,7 @@ BookmarkModel::setItemsEditable(bool editable)
 void
 BookmarkModel::expandFoldersIfNeeeded(QTreeView *treeView)
 {
-    for (QModelIndex index : qAsConst(cache))
+    for (QModelIndex index : std::as_const(cache))
         treeView->setExpanded(index, index.data(UserRoleExpanded).toBool());
 }
 
@@ -130,7 +130,7 @@ BookmarkModel::removeItem(const QModelIndex &index)
         indexes = collectItems(index);
     indexes.append(index);
 
-    for (const QModelIndex &itemToRemove : qAsConst(indexes)) {
+    for (const QModelIndex &itemToRemove : std::as_const(indexes)) {
         if (!removeRow(itemToRemove.row(), itemToRemove.parent()))
             return false;
         cache.remove(itemFromIndex(itemToRemove));
diff --git a/src/assistant/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index 6b49a44db..1455426ac 100644
--- a/src/assistant/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
@@ -42,7 +42,7 @@ void QtDocInstaller::run()
     m_qchFiles = m_qchDir.entryList(QStringList() << QLatin1String("*.qch"));
 
     bool changes = false;
-    for (const DocInfo &docInfo : qAsConst(m_docInfos)) {
+    for (const DocInfo &docInfo : std::as_const(m_docInfos)) {
         changes |= installDoc(docInfo);
         m_mutex.lock();
         if (m_abort) {
@@ -71,7 +71,7 @@ bool QtDocInstaller::installDoc(const DocInfo &docInfo)
         emit qchFileNotFound(component);
         return false;
     }
-    for (const QString &f : qAsConst(m_qchFiles)) {
+    for (const QString &f : std::as_const(m_qchFiles)) {
         if (f.startsWith(component)) {
             QFileInfo fi(m_qchDir.absolutePath() + QDir::separator() + f);
             if (dt.isValid() && fi.lastModified().toSecsSinceEpoch() == dt.toSecsSinceEpoch()
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 3c6f52b29..ef20113d0 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -768,7 +768,7 @@ bool QHelpCollectionHandler::addCustomFilter(const QString &filterName,
             idsToInsert.removeAll(attributeName);
     }
 
-    for (const QString &id : qAsConst(idsToInsert)) {
+    for (const QString &id : std::as_const(idsToInsert)) {
         m_query->prepare(QLatin1String("INSERT INTO FilterAttributeTable VALUES(NULL, ?)"));
         m_query->bindValue(0, id);
         m_query->exec();
@@ -1511,7 +1511,7 @@ QList<QHelpCollectionHandler::ContentsData> QHelpCollectionHandler::contentsForF
     }
 
     QList<QHelpCollectionHandler::ContentsData> result;
-    for (const auto &versionContents : qAsConst(contentsMap)) {
+    for (const auto &versionContents : std::as_const(contentsMap)) {
         // insert items in the reverse order of version number
         const auto itBegin = versionContents.constBegin();
         auto it = versionContents.constEnd();
@@ -1570,7 +1570,7 @@ QList<QHelpCollectionHandler::ContentsData> QHelpCollectionHandler::contentsForF
     }
 
     QList<QHelpCollectionHandler::ContentsData> result;
-    for (const auto &versionContents : qAsConst(contentsMap)) {
+    for (const auto &versionContents : std::as_const(contentsMap)) {
         // insert items in the reverse order of version number
         const auto itBegin = versionContents.constBegin();
         auto it = versionContents.constEnd();
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 3023298af..40bf92d75 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -221,7 +221,7 @@ QModelIndex QHelpIndexModel::filter(const QString &filter, const QString &wildca
         auto re = QRegularExpression::wildcardToRegularExpression(wildcard,
                                                                   QRegularExpression::UnanchoredWildcardConversion);
         const QRegularExpression regExp(re, QRegularExpression::CaseInsensitiveOption);
-        for (const QString &index : qAsConst(d->indices)) {
+        for (const QString &index : std::as_const(d->indices)) {
             if (index.contains(regExp)) {
                 lst.append(index);
                 if (perfectMatch == -1 && index.startsWith(filter, Qt::CaseInsensitive)) {
@@ -236,7 +236,7 @@ QModelIndex QHelpIndexModel::filter(const QString &filter, const QString &wildca
             }
         }
     } else {
-        for (const QString &index : qAsConst(d->indices)) {
+        for (const QString &index : std::as_const(d->indices)) {
             if (index.contains(filter, Qt::CaseInsensitive)) {
                 lst.append(index);
                 if (perfectMatch == -1 && index.startsWith(filter, Qt::CaseInsensitive)) {
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 7dd2ed2fe..df6b5e49e 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -413,7 +413,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
     ++filterSetId;
     QList<int> attValues = filterAtts.values();
     std::sort(attValues.begin(), attValues.end());
-    for (int attId : qAsConst(attValues)) {
+    for (int attId : std::as_const(attValues)) {
         m_query->prepare(QLatin1String("INSERT INTO FileAttributeSetTable "
             "VALUES(?, ?)"));
         m_query->bindValue(0, filterSetId);
@@ -480,7 +480,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
             fileId = it.value();
             QSet<int> &fileFilterSet = m_fileFilterMap[fileId];
             QSet<int> &tmpFileFilterSet = tmpFileFilterMap[fileId];
-            for (int filter : qAsConst(filterAtts)) {
+            for (int filter : std::as_const(filterAtts)) {
                 if (!fileFilterSet.contains(filter)
                     && !tmpFileFilterSet.contains(filter)) {
                     fileFilterSet.insert(filter);
@@ -495,7 +495,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
         for (auto it = tmpFileFilterMap.cbegin(), end = tmpFileFilterMap.cend(); it != end; ++it) {
             QList<int> filterValues = it.value().values();
             std::sort(filterValues.begin(), filterValues.end());
-            for (int fv : qAsConst(filterValues)) {
+            for (int fv : std::as_const(filterValues)) {
                 m_query->prepare(QLatin1String("INSERT INTO FileFilterTable "
                     "VALUES(?, ?)"));
                 m_query->bindValue(0, fv);
@@ -504,7 +504,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
             }
         }
 
-        for (const QByteArray &fileData : qAsConst(fileDataList)) {
+        for (const QByteArray &fileData : std::as_const(fileDataList)) {
             m_query->prepare(QLatin1String("INSERT INTO FileDataTable VALUES "
                 "(Null, ?)"));
             m_query->bindValue(0, fileData);
@@ -513,7 +513,7 @@ bool HelpGeneratorPrivate::insertFiles(const QStringList &files, const QString &
                 addProgress(m_fileStep * 20.0);
         }
 
-        for (const FileNameTableData &fnd : qAsConst(fileNameDataList)) {
+        for (const FileNameTableData &fnd : std::as_const(fileNameDataList)) {
             m_query->prepare(QLatin1String("INSERT INTO FileNameTable "
                 "(FolderId, Name, FileId, Title) VALUES (?, ?, ?, ?)"));
             m_query->bindValue(0, 1);
@@ -549,7 +549,7 @@ bool HelpGeneratorPrivate::registerCustomFilter(const QString &filterName,
         idsToInsert.removeAll(m_query->value(1).toString());
     }
 
-    for (const QString &id : qAsConst(idsToInsert)) {
+    for (const QString &id : std::as_const(idsToInsert)) {
         m_query->prepare(QLatin1String("INSERT INTO FilterAttributeTable VALUES(NULL, ?)"));
         m_query->bindValue(0, id);
         m_query->exec();
@@ -656,8 +656,8 @@ bool HelpGeneratorPrivate::insertKeywords(const QList<QHelpDataIndexItem> &keywo
     m_query->exec(QLatin1String("COMMIT"));
 
     m_query->exec(QLatin1String("BEGIN"));
-    for (int idx : qAsConst(indexFilterTable)) {
-        for (int a : qAsConst(filterAtts)) {
+    for (int idx : std::as_const(indexFilterTable)) {
+        for (int a : std::as_const(filterAtts)) {
             m_query->prepare(QLatin1String("INSERT INTO IndexFilterTable (FilterAttributeId, IndexId) "
                 "VALUES(?, ?)"));
             m_query->bindValue(0, a);
@@ -766,7 +766,7 @@ bool HelpGeneratorPrivate::checkLinks(const QHelpProjectData &helpData)
      *         commented out can cause false warning.
      */
     bool allLinksOk = true;
-    for (const QString &fileName : qAsConst(files)) {
+    for (const QString &fileName : std::as_const(files)) {
         if (!fileName.endsWith(QLatin1String("html"))
             && !fileName.endsWith(QLatin1String("htm")))
             continue;
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 54396f2a0..5563c35af 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -158,11 +158,11 @@ void BuddyEditor::updateBackground()
     if (!toRemove.isEmpty()) {
         DeleteConnectionsCommand command(this, toRemove);
         command.redo();
-        for (Connection *con : qAsConst(toRemove))
+        for (Connection *con : std::as_const(toRemove))
             delete takeConnection(con);
     }
 
-    for (Connection *newConn : qAsConst(newList)) {
+    for (Connection *newConn : std::as_const(newList)) {
         bool found = false;
         const int c = connectionCount();
         for (int i = 0; i < c; i++) {
@@ -253,7 +253,7 @@ void BuddyEditor::widgetRemoved(QWidget *widget)
     child_list.prepend(widget);
 
     ConnectionSet remove_set;
-    for (QWidget *w : qAsConst(child_list)) {
+    for (QWidget *w : std::as_const(child_list)) {
         const ConnectionList &cl = connectionList();
         for (Connection *con : cl) {
             if (con->widget(EndPoint::Source) == w || con->widget(EndPoint::Target) == w)
@@ -263,7 +263,7 @@ void BuddyEditor::widgetRemoved(QWidget *widget)
 
     if (!remove_set.isEmpty()) {
         undoStack()->beginMacro(tr("Remove buddies"));
-        for (Connection *con : qAsConst(remove_set)) {
+        for (Connection *con : std::as_const(remove_set)) {
             setSelected(con, false);
             con->update();
             QWidget *source = con->widget(EndPoint::Source);
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 161e5fa4d..382030c20 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -667,7 +667,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
 
     QSet<QWidget*> widget_set;
 
-    for (QWidget *child : qAsConst(sel)) { // Move parent layout or container?
+    for (QWidget *child : std::as_const(sel)) { // Move parent layout or container?
         QWidget *current = child;
 
         bool done = false;
@@ -704,7 +704,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
     const QPoint globalPos = mapToGlobal(m_startPos);
     const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ?
                             QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop;
-    for (QWidget *widget : qAsConst(sel)) {
+    for (QWidget *widget : std::as_const(sel)) {
         item_list.append(new FormWindowDnDItem(dropType,  this, widget, globalPos));
         if (dropType == QDesignerDnDItemInterface::MoveDrop) {
             m_selection->hide(widget);
@@ -721,7 +721,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
 
     if (!sel.isEmpty()) // reshow selection?
         if (QDesignerMimeData::execDrag(item_list, core()->topLevel()) == Qt::IgnoreAction && dropType == QDesignerDnDItemInterface::MoveDrop)
-            for (QWidget *widget : qAsConst(sel))
+            for (QWidget *widget : std::as_const(sel))
                 m_selection->show(widget);
 
     m_startPos = QPoint();
@@ -1285,7 +1285,7 @@ QWidget *FormWindow::containerAt(const QPoint &pos, QWidget *notParentOf)
         depth = widgetDepth(container);
     }
 
-    for (QWidget *wit : qAsConst(m_widgets)) {
+    for (QWidget *wit : std::as_const(m_widgets)) {
         if (qobject_cast<QLayoutWidget*>(wit) || qobject_cast<QSplitter*>(wit))
             continue;
         if (!wit->isVisibleTo(this))
@@ -1502,7 +1502,7 @@ ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *f
 void ArrowKeyPropertyCommand::init(QWidgetList &l, const ArrowKeyOperation &op)
 {
     QObjectList ol;
-    for (QWidget *w : qAsConst(l))
+    for (QWidget *w : std::as_const(l))
         ol.push_back(w);
     SetPropertyCommand::init(ol, QStringLiteral("geometry"), QVariant::fromValue(op));
 
@@ -1577,7 +1577,7 @@ bool FormWindow::handleKeyReleaseEvent(QWidget *, QWidget *, QKeyEvent *e)
 void FormWindow::selectAll()
 {
     bool selectionChanged = false;
-    for (QWidget *widget : qAsConst(m_widgets)) {
+    for (QWidget *widget : std::as_const(m_widgets)) {
         if (widget->isVisibleTo(this) && trySelectWidget(widget, true))
             selectionChanged = true;
     }
@@ -2017,7 +2017,7 @@ void FormWindow::raiseWidgets()
         return;
 
     beginCommand(tr("Raise widgets"));
-    for (QWidget *widget : qAsConst(widgets)) {
+    for (QWidget *widget : std::as_const(widgets)) {
         RaiseWidgetCommand *cmd = new RaiseWidgetCommand(this);
         cmd->init(widget);
         m_undoStack.push(cmd);
@@ -2034,7 +2034,7 @@ void FormWindow::lowerWidgets()
         return;
 
     beginCommand(tr("Lower widgets"));
-    for (QWidget *widget : qAsConst(widgets)) {
+    for (QWidget *widget : std::as_const(widgets)) {
         LowerWidgetCommand *cmd = new LowerWidgetCommand(this);
         cmd->init(widget);
         m_undoStack.push(cmd);
@@ -2850,7 +2850,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list,
     QPoint offset;
     QDesignerDnDItemInterface *current = nullptr;
     QDesignerFormWindowCursorInterface *c = cursor();
-    for (QDesignerDnDItemInterface *item : qAsConst(item_list)) {
+    for (QDesignerDnDItemInterface *item : std::as_const(item_list)) {
         QWidget *w = item->widget();
         if (!current)
             current = item;
@@ -2865,7 +2865,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list,
         offset = designerGrid().snapPoint(topLeft) - topLeft;
     }
 
-    for (QDesignerDnDItemInterface *item : qAsConst(item_list)) {
+    for (QDesignerDnDItemInterface *item : std::as_const(item_list)) {
         DomUI *dom_ui = item->domUi();
         QRect geometry = item->decoration()->geometry();
         Q_ASSERT(dom_ui != nullptr);
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
index a5af408f0..0373e91ac 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -87,7 +87,7 @@ void FormWindowWidgetStack::setSenderAsCurrentTool()
         return;
     }
 
-    for (QDesignerFormWindowToolInterface *t : qAsConst(m_tools)) {
+    for (QDesignerFormWindowToolInterface *t : std::as_const(m_tools)) {
         if (action == t->action()) {
             tool = t;
             break;
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index b1a598a5f..530a976a6 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -614,7 +614,7 @@ void FormWindowManager::slotActionAdjustSizeActivated()
     }
 
     // Always count the main container as unlaid-out
-    for (QWidget *widget : qAsConst(selectedWidgets)) {
+    for (QWidget *widget : std::as_const(selectedWidgets)) {
         bool unlaidout = LayoutInfo::layoutType(core(), widget->parentWidget()) == LayoutInfo::NoLayout;
         bool isMainContainer = m_activeFormWindow->isMainContainer(widget);
 
@@ -726,7 +726,7 @@ QSet<QWidget *> FormWindowManager::getUnsortedLayoutsToBeBroken(bool firstOnly)
     if (selection.isEmpty() && m_activeFormWindow->mainContainer())
         selection.append(m_activeFormWindow->mainContainer());
 
-    for (QWidget *selectedWidget : qAsConst(selection)) {
+    for (QWidget *selectedWidget : std::as_const(selection)) {
         // find all layouts
         const QWidgetList &list = layoutsToBeBroken(selectedWidget);
         if (!list.isEmpty()) {
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 27d08a4a7..df3e797cc 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -1709,7 +1709,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     // actions
     if (!selection.m_actions.isEmpty()) {
         QList<DomAction *> domActions;
-        for (QAction* action : qAsConst(selection.m_actions)) {
+        for (QAction* action : std::as_const(selection.m_actions)) {
             if (DomAction *domAction = createDom(action))
                 domActions += domAction;
         }
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp
index adb2aa687..a1df46d50 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -72,7 +72,7 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
             candidates.append(mw->layout());
             candidates += mw->layout()->findChildren<QLayout*>();
         }
-        for (QLayout *l : qAsConst(candidates)) {
+        for (QLayout *l : std::as_const(candidates)) {
             if (l->indexOf(me) != -1)
                 return mw->dockWidgetArea(me);
         }
diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp
index f256ff871..58026af60 100644
--- a/src/designer/src/components/formeditor/qwizard_container.cpp
+++ b/src/designer/src/components/formeditor/qwizard_container.cpp
@@ -114,7 +114,7 @@ void QWizardContainer::insertWidget(int index, QWidget *widget)
             m_wizard->removePage(idList.at(i));
         }
         int newId = idBefore + delta;
-        for (QWizardPage *page : qAsConst(pageList)) {
+        for (QWizardPage *page : std::as_const(pageList)) {
             m_wizard->setPage(newId, page);
             newId += delta;
         }
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index 13fd9e7bb..08b4d1f1d 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -276,7 +276,7 @@ namespace qdesigner_internal {
             }
             // Add button groups
             if (!buttonGroups.isEmpty()) {
-                for (QButtonGroup *group : qAsConst(buttonGroups))
+                for (QButtonGroup *group : std::as_const(buttonGroups))
                     createModelRecursion(fwi, object, group, model, ctx);
             }
         } // has children
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 7d6b0f4b4..bb98d5824 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -1267,7 +1267,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
             return;
 
         PropertyToPropertyListMap::iterator pfit = m_propertyToFlags.find(property);
-        for (QtProperty *prop : qAsConst(pfit.value())) {
+        for (QtProperty *prop : std::as_const(pfit.value())) {
             if (prop) {
                 delete prop;
                 m_flagToProperty.remove(prop);
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 49491859b..eaaa01ed1 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -571,7 +571,7 @@ void PropertyEditor::fillView()
         for (auto itProperty = m_nameToProperty.cbegin(), end = m_nameToProperty.cend(); itProperty != end; ++itProperty)
             m_currentBrowser->addProperty(itProperty.value());
     } else {
-        for (QtProperty *group : qAsConst(m_groups)) {
+        for (QtProperty *group : std::as_const(m_groups)) {
             QtBrowserItem *item = m_currentBrowser->addProperty(group);
             if (m_currentBrowser == m_treeBrowser)
                 m_treeBrowser->setBackgroundColor(item, propertyColor(group));
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index b771d711f..6ceb07e51 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -620,7 +620,7 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent,
                 continue;
             // Mark deprecated members by passing bool=true.
             QMap<QString, bool> markedMemberList;
-            for (const QString &member : qAsConst(classInfo.m_memberList))
+            for (const QString &member : std::as_const(classInfo.m_memberList))
                 markedMemberList.insert(member, false);
             inline_editor->addTitle(classInfo.m_className);
             inline_editor->addTextList(markedMemberList);
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index 921661703..1385bfa1e 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -225,7 +225,7 @@ void AbstractItemEditor::cacheReloaded()
 void AbstractItemEditor::updateBrowser()
 {
     BoolBlocker block(m_updatingBrowser);
-    for (QtVariantProperty *prop : qAsConst(m_properties)) {
+    for (QtVariantProperty *prop : std::as_const(m_properties)) {
         int role = m_propertyToRole.value(prop);
         QVariant val = getItemData(role);
 
@@ -244,7 +244,7 @@ void AbstractItemEditor::updateBrowser()
     }
 
     if (m_propertyBrowser->topLevelItems().isEmpty()) {
-        for (QtVariantProperty *prop : qAsConst(m_rootProperties))
+        for (QtVariantProperty *prop : std::as_const(m_rootProperties))
             m_propertyBrowser->addProperty(prop);
     }
 }
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index 09d94780e..38c197cc6 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -113,7 +113,7 @@ QtVariantProperty *TreeWidgetEditor::setupPropertyGroup(const QString &title, Pr
 {
     setupProperties(propDefs);
     QtVariantProperty *groupProp = m_propertyManager->addProperty(QtVariantPropertyManager::groupTypeId(), title);
-    for (QtVariantProperty *prop : qAsConst(m_rootProperties))
+    for (QtVariantProperty *prop : std::as_const(m_rootProperties))
         groupProp->addSubProperty(prop);
     m_rootProperties.clear();
     return groupProp;
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index e5ac0585e..67686c274 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -300,7 +300,7 @@ bool WidgetBoxTreeWidget::loadContents(const QString &contents)
         return false;
     }
 
-    for (const Category &cat : qAsConst(cat_list))
+    for (const Category &cat : std::as_const(cat_list))
         addCategory(cat);
 
     addCustomCategories(false);
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 00466226c..53f3fad41 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -196,7 +196,7 @@ ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
 
     m_manager->setMainWindow(configureableMainWindow);
 
-    for (QToolBar *tb : qAsConst(m_toolbars)) {
+    for (QToolBar *tb : std::as_const(m_toolbars)) {
         const QString title = tb->windowTitle();
         m_manager->addToolBar(tb, title);
         addActionsToToolBarManager(tb->actions(), title, m_manager);
@@ -240,7 +240,7 @@ void ToolBarManager::updateToolBarMenu()
     std::stable_sort(m_toolbars.begin(), m_toolbars.end(), toolBarTitleLessThan);
     // add to menu
     m_toolBarMenu->clear();
-    for (QToolBar *tb : qAsConst(m_toolbars))
+    for (QToolBar *tb : std::as_const(m_toolbars))
         m_toolBarMenu->addAction(tb->toggleViewAction());
     m_toolBarMenu->addAction(m_configureAction);
 }
diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp
index 28ecaf004..3162e7255 100644
--- a/src/designer/src/designer/preferencesdialog.cpp
+++ b/src/designer/src/designer/preferencesdialog.cpp
@@ -24,7 +24,7 @@ PreferencesDialog::PreferencesDialog(QDesignerFormEditorInterface *core, QWidget
     m_optionsPages = core->optionsPages();
 
     m_ui->m_optionTabWidget->clear();
-    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages)) {
+    for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages)) {
         QWidget *page = optionsPage->createPage(this);
         m_ui->m_optionTabWidget->addTab(page, optionsPage->name());
         if (QDesignerAppearanceOptionsWidget *appearanceWidget = qobject_cast<QDesignerAppearanceOptionsWidget *>(page))
@@ -49,7 +49,7 @@ QPushButton *PreferencesDialog::applyButton() const
 
 void PreferencesDialog::slotApply()
 {
-    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages))
+    for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages))
         optionsPage->apply();
 }
 
@@ -74,7 +74,7 @@ void PreferencesDialog::slotUiModeChanged(bool modified)
 
 void PreferencesDialog::closeOptionPages()
 {
-    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages))
+    for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages))
         optionsPage->finish();
 }
 
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index f1f54e461..785729e96 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -1071,7 +1071,7 @@ void QDesignerActions::backupForms()
         for (const QString &backupFile : backupFiles)
             backupDir.remove(backupFile);
 
-        for (const QString &tmpName : qAsConst(tmpFiles)) {
+        for (const QString &tmpName : std::as_const(tmpFiles)) {
             QString name(tmpName);
             name.replace(m_backupTmpPath, m_backupPath);
             QFile tmpFile(tmpName);
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 693d14f97..b56144175 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -243,17 +243,17 @@ void QDesignerWorkbench::saveGeometriesForModeChange()
         break;
     case TopLevelMode: {
         const QPoint desktopOffset = QGuiApplication::primaryScreen()->availableGeometry().topLeft();
-        for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
+        for (QDesignerToolWindow *tw : std::as_const(m_toolWindows))
             m_Positions.insert(tw, Position(tw, desktopOffset));
-        for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
+        for (QDesignerFormWindow *fw : std::as_const(m_formWindows))
             m_Positions.insert(fw,  Position(fw, desktopOffset));
     }
         break;
     case DockedMode: {
         const QPoint mdiAreaOffset = m_dockedMainWindow->mdiArea()->pos();
-        for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
+        for (QDesignerToolWindow *tw : std::as_const(m_toolWindows))
             m_Positions.insert(tw, Position(dockWidgetOf(tw)));
-        for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
+        for (QDesignerFormWindow *fw : std::as_const(m_formWindows))
             m_Positions.insert(fw, Position(mdiSubWindowOf(fw), mdiAreaOffset));
     }
         break;
@@ -344,7 +344,7 @@ void QDesignerWorkbench::switchToNeutralMode()
 
     m_mode = NeutralMode;
 
-    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows)) {
+    for (QDesignerToolWindow *tw : std::as_const(m_toolWindows)) {
         tw->setCloseEventPolicy(MainWindowBase::AcceptCloseEvents);
         tw->setParent(nullptr);
         // Prevent unneeded native children when switching to docked
@@ -355,7 +355,7 @@ void QDesignerWorkbench::switchToNeutralMode()
     if (m_dockedMainWindow != nullptr) // Prevent assert
         m_dockedMainWindow->mdiArea()->setActiveSubWindow(nullptr);
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows)) {
         fw->setParent(nullptr);
         fw->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
         // Prevent unneeded native children when switching to docked
@@ -411,7 +411,7 @@ void QDesignerWorkbench::switchToDockedMode()
 #endif
     qDesigner->setMainWindow(m_dockedMainWindow);
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows)) {
         QMdiSubWindow *subwin = m_dockedMainWindow->createMdiSubWindow(fw, magicalWindowFlags(fw),
                                                                        m_actionManager->closeFormAction()->shortcut());
         subwin->hide();
@@ -431,7 +431,7 @@ void QDesignerWorkbench::adjustMDIFormPositions()
 {
     const QPoint mdiAreaOffset = m_dockedMainWindow->mdiArea()->pos();
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows)) {
         const PositionMap::const_iterator pit = m_Positions.constFind(fw);
         if (pit != m_Positions.constEnd())
             pit->applyTo(mdiSubWindowOf(fw), mdiAreaOffset);
@@ -485,7 +485,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
     widgetBoxWrapper->restoreState(settings.mainWindowState(m_mode), MainWindowBase::settingsVersion());
 
     bool found_visible_window = false;
-    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows)) {
+    for (QDesignerToolWindow *tw : std::as_const(m_toolWindows)) {
         tw->setParent(magicalParent(tw), magicalWindowFlags(tw));
         settings.restoreGeometry(tw, tw->geometryHint());
         tw->action()->setChecked(tw->isVisible());
@@ -497,7 +497,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
 
     m_actionManager->setBringAllToFrontVisible(true);
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows)) {
         fw->setParent(magicalParent(fw), magicalWindowFlags(fw));
         fw->setAttribute(Qt::WA_DeleteOnClose, true);
         const PositionMap::const_iterator pit = m_Positions.constFind(fw);
@@ -607,7 +607,7 @@ void QDesignerWorkbench::initializeCorePlugins()
     QObjectList plugins = QPluginLoader::staticInstances();
     plugins += core()->pluginManager()->instances();
 
-    for (QObject *plugin : qAsConst(plugins)) {
+    for (QObject *plugin : std::as_const(plugins)) {
         if (QDesignerFormEditorPluginInterface *formEditorPlugin = qobject_cast<QDesignerFormEditorPluginInterface*>(plugin)) {
             if (!formEditorPlugin->isInitialized())
                 formEditorPlugin->initialize(core());
@@ -674,7 +674,7 @@ bool QDesignerWorkbench::handleClose()
 {
     m_state = StateClosing;
     QList<QDesignerFormWindow *> dirtyForms;
-    for (QDesignerFormWindow *w : qAsConst(m_formWindows)) {
+    for (QDesignerFormWindow *w : std::as_const(m_formWindows)) {
         if (w->editor()->isDirty())
             dirtyForms << w;
     }
@@ -700,7 +700,7 @@ bool QDesignerWorkbench::handleClose()
             m_state = StateUp;
             return false;
         case QMessageBox::Save:
-            for (QDesignerFormWindow *fw : qAsConst(dirtyForms)) {
+            for (QDesignerFormWindow *fw : std::as_const(dirtyForms)) {
                 fw->show();
                 fw->raise();
                 if (!fw->close()) {
@@ -710,7 +710,7 @@ bool QDesignerWorkbench::handleClose()
             }
             break;
         case QMessageBox::Discard:
-            for (QDesignerFormWindow *fw : qAsConst(dirtyForms)) {
+            for (QDesignerFormWindow *fw : std::as_const(dirtyForms)) {
                 fw->editor()->setDirty(false);
                 fw->setWindowModified(false);
             }
@@ -718,7 +718,7 @@ bool QDesignerWorkbench::handleClose()
         }
     }
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows))
         fw->close();
 
     saveSettings();
@@ -749,7 +749,7 @@ void QDesignerWorkbench::updateWindowMenu(QDesignerFormWindowInterface *fwi)
     m_actionManager->minimizeAction()->setEnabled(minimizeEnabled);
     m_actionManager->minimizeAction()->setChecked(minimizeChecked);
 
-    for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
+    for (QDesignerFormWindow *fw : std::as_const(m_formWindows))
         fw->action()->setChecked(fw == activeFormWindow);
 }
 
@@ -773,7 +773,7 @@ void QDesignerWorkbench::formWindowActionTriggered(QAction *a)
 
 void QDesignerWorkbench::closeAllToolWindows()
 {
-    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
+    for (QDesignerToolWindow *tw : std::as_const(m_toolWindows))
         tw->hide();
 }
 
@@ -827,9 +827,9 @@ void QDesignerWorkbench::bringAllToFront()
 {
     if (m_mode !=  TopLevelMode)
         return;
-    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
+    for (QDesignerToolWindow *tw : std::as_const(m_toolWindows))
         raiseWindow(tw);
-    for (QDesignerFormWindow *dfw : qAsConst(m_formWindows))
+    for (QDesignerFormWindow *dfw : std::as_const(m_formWindows))
         raiseWindow(dfw);
 }
 
@@ -1066,7 +1066,7 @@ void QDesignerWorkbench::restoreUISettings()
     if (font == m_toolWindows.constFirst()->font())
         return;
 
-    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
+    for (QDesignerToolWindow *tw : std::as_const(m_toolWindows))
         tw->setFont(font);
 }
 
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index e74e4db59..94e8484b0 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -80,14 +80,14 @@ void VersionLabel::mouseReleaseEvent(QMouseEvent *me)
         if (!secondStage) {
             m_path.lineTo(me->pos());
             bool gotIt = true;
-            for (const QPoint &pt : qAsConst(hitPoints)) {
+            for (const QPoint &pt : std::as_const(hitPoints)) {
                 if (!m_path.contains(pt)) {
                     gotIt = false;
                     break;
                 }
             }
             if (gotIt) {
-                for (const QPoint &pt : qAsConst(missPoints)) {
+                for (const QPoint &pt : std::as_const(missPoints)) {
                     if (m_path.contains(pt)) {
                         gotIt = false;
                         break;
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index c5a25049f..6bfca9c6d 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -180,7 +180,7 @@ DeleteConnectionsCommand::DeleteConnectionsCommand(ConnectionEdit *edit,
 
 void DeleteConnectionsCommand::redo()
 {
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         const int idx = edit()->indexOfConnection(con);
         emit edit()->aboutToRemoveConnection(con);
         Q_ASSERT(edit()->m_con_list.contains(con));
@@ -194,7 +194,7 @@ void DeleteConnectionsCommand::redo()
 
 void DeleteConnectionsCommand::undo()
 {
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         Q_ASSERT(!edit()->m_con_list.contains(con));
         emit edit()->aboutToAddConnection(edit()->m_con_list.size());
         edit()->m_con_list.append(con);
@@ -960,7 +960,7 @@ void ConnectionEdit::updateBackground()
     if (!m_enable_update_background)
         return;
 
-    for (Connection *c : qAsConst(m_con_list))
+    for (Connection *c : std::as_const(m_con_list))
         c->updateVisibility();
 
     updateLines();
@@ -1038,7 +1038,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
 
     WidgetSet heavy_highlight_set, light_highlight_set;
 
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (!con->isVisible())
             continue;
 
@@ -1056,7 +1056,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    for (QWidget *w : qAsConst(heavy_highlight_set)) {
+    for (QWidget *w : std::as_const(heavy_highlight_set)) {
         p.drawRect(fixRect(widgetRect(w)));
         light_highlight_set.remove(w);
     }
@@ -1066,12 +1066,12 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    for (QWidget *w : qAsConst(light_highlight_set))
+    for (QWidget *w : std::as_const(light_highlight_set))
         p.drawRect(fixRect(widgetRect(w)));
 
     p.setBrush(palette().color(QPalette::Base));
     p.setPen(palette().color(QPalette::Text));
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (con->isVisible()) {
             paintLabel(&p, EndPoint::Source, con);
             paintLabel(&p, EndPoint::Target, con);
@@ -1081,7 +1081,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     p.setPen(m_active_color);
     p.setBrush(m_active_color);
 
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (!selected(con) || !con->isVisible())
             continue;
 
@@ -1402,7 +1402,7 @@ bool ConnectionEdit::selected(const Connection *con) const
 
 void ConnectionEdit::selectNone()
 {
-    for (Connection *con : qAsConst(m_sel_con_set))
+    for (Connection *con : std::as_const(m_sel_con_set))
         con->update();
 
     m_sel_con_set.clear();
@@ -1412,7 +1412,7 @@ void ConnectionEdit::selectAll()
 {
     if (m_sel_con_set.size() == m_con_list.size())
         return;
-    for (Connection *con : qAsConst(m_con_list))
+    for (Connection *con : std::as_const(m_con_list))
         setSelected(con, true);
 }
 
@@ -1491,7 +1491,7 @@ void ConnectionEdit::addConnection(Connection *con)
 
 void ConnectionEdit::updateLines()
 {
-    for (Connection *con : qAsConst(m_con_list))
+    for (Connection *con : std::as_const(m_con_list))
         con->checkWidgets();
 }
 
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index 4428ee2bb..db0100f01 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -240,7 +240,7 @@ void FormWindowBase::reloadProperties()
             toolBox->setCurrentIndex(current);
         }
     }
-    for (QObject *object : qAsConst(m_d->m_reloadablePropertySheets)) {
+    for (QObject *object : std::as_const(m_d->m_reloadablePropertySheets)) {
         reloadIconResources(iconCache(), object);
     }
 }
@@ -426,7 +426,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list)
         tr("Delete '%1'").arg(widget_list.constFirst()->objectName()) : tr("Delete");
 
     commandHistory()->beginMacro(description);
-    for (QWidget *w : qAsConst(widget_list)) {
+    for (QWidget *w : std::as_const(widget_list)) {
         emit widgetRemoved(w);
         DeleteWidgetCommand *cmd = new DeleteWidgetCommand(this);
         cmd->init(w);
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index 7eb145acc..76dac5668 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -416,7 +416,7 @@ IconSelector::IconSelector(QWidget *parent) :
 
     int index = 0;
     QStringList items;
-    for (const auto &item : qAsConst(d_ptr->m_stateToName)) {
+    for (const auto &item : std::as_const(d_ptr->m_stateToName)) {
         const QPair<QIcon::Mode, QIcon::State> state = item.first;
         const QString name = item.second;
 
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index fb8c22619..b2d8922c9 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -115,7 +115,7 @@ void Layout::setup()
     // Widgets which are already laid out are thrown away here too
 
     QMultiMap<QWidget*, QWidget*> lists;
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         QWidget *p = w->parentWidget();
 
         if (p && LayoutInfo::layoutType(m_formWindow->core(), p) != LayoutInfo::NoLayout
@@ -159,7 +159,7 @@ void Layout::setup()
     // be placed and connect to widgetDestroyed() signals of the
     // widgets to get informed if one gets deleted to be able to
     // handle that and do not crash in this case
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         connect(w, &QObject::destroyed, this, &Layout::widgetDestroyed);
         m_startPoint = QPoint(qMin(m_startPoint.x(), w->x()), qMin(m_startPoint.y(), w->y()));
         const QRect rc(w->geometry());
@@ -184,7 +184,7 @@ void Layout::widgetDestroyed()
 
 bool Layout::prepareLayout(bool &needMove, bool &needReparent)
 {
-    for (QWidget *widget : qAsConst(m_widgets))
+    for (QWidget *widget : std::as_const(m_widgets))
         widget->raise();
 
     needMove = !m_layoutBase;
@@ -347,7 +347,7 @@ void Layout::breakLayout()
      * to grow (expanding widgets like QTextEdit), in which the geometry is
      * preserved. Note that historically, geometries were re-applied
      * only after breaking splitters. */
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         const QRect geom = w->geometry();
         const QSize sizeHint = w->sizeHint();
         const bool restoreGeometry = sizeHint.isEmpty() || sizeHint.width() > geom.width() || sizeHint.height() > geom.height();
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index c579d8a18..21ef81e3e 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -164,7 +164,7 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent
     if (m_deviceProfiles.isEmpty()) {
         m_ui->profileComboBox->setEnabled(false);
     } else {
-        for (const auto &deviceProfile : qAsConst(m_deviceProfiles))
+        for (const auto &deviceProfile : std::as_const(m_deviceProfiles))
             m_ui->profileComboBox->addItem(deviceProfile.name());
         const int ci = settings.currentDeviceProfileIndex();
         if (ci >= 0)
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 99d1c8c91..ca7363e98 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -628,7 +628,7 @@ void QDesignerPluginManager::updateRegisteredPlugins()
     if (debugPluginManager)
         qDebug() << Q_FUNC_INFO;
     m_d->m_registeredPlugins.clear();
-    for (const QString &path : qAsConst(m_d->m_pluginPaths))
+    for (const QString &path : std::as_const(m_d->m_pluginPaths))
         registerPath(path);
 }
 
@@ -638,7 +638,7 @@ bool QDesignerPluginManager::registerNewPlugins()
         qDebug() << Q_FUNC_INFO;
 
     const int before = m_d->m_registeredPlugins.size();
-    for (const QString &path : qAsConst(m_d->m_pluginPaths))
+    for (const QString &path : std::as_const(m_d->m_pluginPaths))
         registerPath(path);
     const bool newPluginsFound = m_d->m_registeredPlugins.size() > before;
     // We force a re-initialize as Jambi collection might return
@@ -709,7 +709,7 @@ void QDesignerPluginManager::ensureInitialized()
         for (QObject *o : staticPluginObjects)
             m_d->addCustomWidgets(o, staticPluginPath, designerLanguage);
     }
-    for (const QString &plugin : qAsConst(m_d->m_registeredPlugins)) {
+    for (const QString &plugin : std::as_const(m_d->m_registeredPlugins)) {
         if (QObject *o = instance(plugin))
             m_d->addCustomWidgets(o, plugin, designerLanguage);
     }
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index cbc8148b7..143f85194 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -119,7 +119,7 @@ PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::PreviewConfigurat
     Skins skins = defaultSkins();
     skins.push_front(SkinNamePath(PreviewConfigurationWidget::tr("None"), QString()));
 
-    for (const auto &skin : qAsConst(skins))
+    for (const auto &skin : std::as_const(skins))
         m_ui.m_skinCombo->addItem(skin.first, QVariant(skin.second));
     m_browseSkinIndex = m_firstUserSkinIndex = skins.size();
     m_ui.m_skinCombo->addItem(PreviewConfigurationWidget::tr("Browse..."), QString());
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 9d7d0da9a..270a5937b 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -600,7 +600,7 @@ void PromoteToCustomWidgetCommand::init(const WidgetPointerList &widgets,const Q
 
 void PromoteToCustomWidgetCommand::redo()
 {
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         if (w)
             promoteWidget(core(), w, m_customClassName);
     }
@@ -619,7 +619,7 @@ void PromoteToCustomWidgetCommand::updateSelection()
 
 void PromoteToCustomWidgetCommand::undo()
 {
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         if (w)
             demoteWidget(core(), w);
     }
@@ -832,7 +832,7 @@ void BreakLayoutCommand::redo()
     m_layout->breakLayout();
     delete deco; // release the extension
 
-    for (QWidget *widget : qAsConst(m_widgets)) {
+    for (QWidget *widget : std::as_const(m_widgets)) {
         widget->resize(widget->size().expandedTo(QSize(16, 16)));
     }
     // Update unless we are in an intermediate state of morphing layout
@@ -2659,7 +2659,7 @@ void RemoveActionCommand::init(QAction *action)
 void RemoveActionCommand::redo()
 {
     QDesignerFormWindowInterface *fw = formWindow();
-    for (const ActionDataItem &item : qAsConst(m_actionData)) {
+    for (const ActionDataItem &item : std::as_const(m_actionData)) {
         item.widget->removeAction(m_action);
     }
     // Notify components (for example, signal slot editor)
@@ -2676,7 +2676,7 @@ void RemoveActionCommand::undo()
 {
     core()->actionEditor()->setFormWindow(formWindow());
     core()->actionEditor()->manageAction(m_action);
-    for (const ActionDataItem &item : qAsConst(m_actionData))
+    for (const ActionDataItem &item : std::as_const(m_actionData))
         item.widget->insertAction(item.before, m_action);
     if (!m_actionData.isEmpty())
         core()->objectInspector()->setFormWindow(formWindow());
diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
index 9b9c71a9b..4b838df9a 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -198,7 +198,7 @@ Qt::DropAction QDesignerMimeData::execDrag(const QDesignerDnDItems &items, QWidg
     const Qt::DropAction executedAction = drag->exec(Qt::CopyAction|Qt::MoveAction, mimeData->proposedDropAction());
 
     if (executedAction == Qt::IgnoreAction) {
-        for (QWidget *w : qAsConst(reshowWidgets))
+        for (QWidget *w : std::as_const(reshowWidgets))
             w->show();
     }
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index d3ad56c0f..c79cd6152 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -1393,7 +1393,7 @@ bool AddDynamicPropertyCommand::init(const QObjectList &selection, QObject *curr
 void AddDynamicPropertyCommand::redo()
 {
     QDesignerFormEditorInterface *core = formWindow()->core();
-    for (QObject *obj : qAsConst(m_selection)) {
+    for (QObject *obj : std::as_const(m_selection)) {
         QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core->extensionManager(), obj);
         dynamicSheet->addDynamicProperty(m_propertyName, m_value);
         if (QDesignerPropertyEditorInterface *propertyEditor = formWindow()->core()->propertyEditor()) {
@@ -1406,7 +1406,7 @@ void AddDynamicPropertyCommand::redo()
 void AddDynamicPropertyCommand::undo()
 {
     QDesignerFormEditorInterface *core = formWindow()->core();
-    for (QObject *obj : qAsConst(m_selection)) {
+    for (QObject *obj : std::as_const(m_selection)) {
         QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), obj);
         QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core->extensionManager(), obj);
         dynamicSheet->removeDynamicProperty(sheet->indexOf(m_propertyName));
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index b26b30d71..aa64e986c 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -204,7 +204,7 @@ void QSimpleResource::handleDomCustomWidgets(const QDesignerFormEditorInterface
     // Oops, there are classes left whose base class could not be found.
     // Default them to QWidget with warnings.
     const QString fallBackBaseClass = QStringLiteral("QWidget");
-    for (DomCustomWidget *custom_widget : qAsConst(custom_widget_list)) {
+    for (DomCustomWidget *custom_widget : std::as_const(custom_widget_list)) {
         const QString customClassName = custom_widget->elementClass();
         const QString base_class = custom_widget->elementExtends();
         qDebug() << "** WARNING The base class " << base_class << " of the custom widget class " << customClassName
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp
index 03e04de38..f24147cae 100644
--- a/src/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/src/designer/src/lib/shared/qtresourcemodel.cpp
@@ -310,7 +310,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     }
 
     if (!newResourceSetChanged && !needReregister && (m_currentResourceSet == resourceSet)) {
-        for (const QByteArray *data : qAsConst(toDelete))
+        for (const QByteArray *data : std::as_const(toDelete))
             deleteResource(data);
 
         return; // nothing changed
@@ -319,7 +319,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     if (needReregister)
         unregisterResourceSet(m_currentResourceSet);
 
-    for (const QByteArray *data : qAsConst(toDelete))
+    for (const QByteArray *data : std::as_const(toDelete))
         deleteResource(data);
 
     m_pathToData = newPathToData;
diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp
index 4a92af9cb..ccda74a76 100644
--- a/src/designer/src/lib/shared/rcc.cpp
+++ b/src/designer/src/lib/shared/rcc.cpp
@@ -571,7 +571,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
     if (parent->m_children.contains(filename)) {
-        for (const QString &fileName : qAsConst(m_fileNames)) {
+        for (const QString &fileName : std::as_const(m_fileNames)) {
             qWarning("%s: Warning: potential duplicate alias detected: '%s'",
                      qPrintable(fileName), qPrintable(filename));
         }
diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp
index e71fc65cf..2938045c1 100644
--- a/src/designer/src/lib/shared/selectsignaldialog.cpp
+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp
@@ -91,7 +91,7 @@ static void appendClass(const QString &className, Methods methods, QStandardItem
     std::sort(methods.begin(), methods.end(), signatureLessThan);
     QStandardItem *topLevelItem = createTopLevelItem(className);
     model->appendRow(topLevelItem);
-    for (const SelectSignalDialog::Method &m : qAsConst(methods)) {
+    for (const SelectSignalDialog::Method &m : std::as_const(methods)) {
         QStandardItem *item = new QStandardItem(m.signature);
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
         item->setData(QVariant::fromValue(m), MethodRole);
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp
index 6e8ab41d2..f00966487 100644
--- a/src/designer/src/lib/shared/widgetdatabase.cpp
+++ b/src/designer/src/lib/shared/widgetdatabase.cpp
@@ -397,7 +397,7 @@ void WidgetDataBase::loadPlugins()
     unsigned addedPlugins = 0;
     unsigned removedPlugins = 0;
     if (!pluginList.isEmpty()) {
-        for (QDesignerWidgetDataBaseItemInterface *pluginItem : qAsConst(pluginList)) {
+        for (QDesignerWidgetDataBaseItemInterface *pluginItem : std::as_const(pluginList)) {
             const QString pluginName = pluginItem->name();
             NameIndexMap::iterator existingIt = existingCustomClasses.find(pluginName);
             if (existingIt == existingCustomClasses.end()) {
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 604a7f9d1..d4f30aab3 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1121,7 +1121,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
         }
     }
 
-    for (QObject *obj : qAsConst(children)) {
+    for (QObject *obj : std::as_const(children)) {
         if (QWidget *childWidget = qobject_cast<QWidget*>(obj)) {
             if (d->m_laidout.contains(childWidget) || !recursive)
                 continue;
@@ -1311,7 +1311,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout
 
     QList<DomLayoutItem *> ui_items;
     ui_items.reserve(newList.size());
-    for (const FormBuilderSaveLayoutEntry &item : qAsConst(newList)) {
+    for (const FormBuilderSaveLayoutEntry &item : std::as_const(newList)) {
         if (DomLayoutItem *ui_item = createDom(item.item, lay, ui_parentWidget)) {
             if (item.row >= 0)
                 ui_item->setAttributeRow(item.row);
@@ -1936,7 +1936,7 @@ void QAbstractFormBuilder::saveItemViewExtraInfo(const QAbstractItemView *itemVi
                 const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                                   + realPropertyName.mid(1);
                 const QString fakePropertyName = headerPrefix + upperPropertyName;
-                for (DomProperty *property : qAsConst(headerProperties)) {
+                for (DomProperty *property : std::as_const(headerProperties)) {
                     if (property->attributeName() == realPropertyName) {
                         property->setAttributeName(fakePropertyName);
                         viewProperties << property;
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 26fe09559..f27b8e96e 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -432,7 +432,7 @@ void QFormBuilder::updateCustomWidgets()
     d->m_customWidgets.clear();
 
 #if QT_CONFIG(library)
-    for (const QString &path : qAsConst(d->m_pluginPaths)) {
+    for (const QString &path : std::as_const(d->m_pluginPaths)) {
         const QDir dir(path);
         const QStringList candidates = dir.entryList(QDir::Files);
 
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index 9ba4c4302..fc1961aa9 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -744,7 +744,7 @@ QFormBuilderStrings::QFormBuilderStrings() :
     itemRoles.append(qMakePair(Qt::ForegroundRole, QString::fromLatin1("foreground")));
     itemRoles.append(qMakePair(Qt::CheckStateRole, QString::fromLatin1("checkState")));
 
-    for (const RoleNName &it : qAsConst(itemRoles))
+    for (const RoleNName &it : std::as_const(itemRoles))
         treeItemRoleHash.insert(it.second, it.first);
 
     itemTextRoles.append(qMakePair(qMakePair(Qt::EditRole, Qt::DisplayPropertyRole),
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp
index 79e54d197..a38e903b7 100644
--- a/src/kmap2qmap/main.cpp
+++ b/src/kmap2qmap/main.cpp
@@ -616,7 +616,7 @@ bool KeymapParser::parseKmap(QFile *f)
                     searchpath << d;
                 searchpath << QDir::current();
 
-                for (const QDir &path : qAsConst(searchpath)) {
+                for (const QDir &path : std::as_const(searchpath)) {
                     QFile f2(path.filePath(incname));
                     //qWarning("  -- trying to include %s", qPrintable(f2.fileName()));
                     if (f2.open(QIODevice::ReadOnly)) {
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()) {
diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp
index 68a1fa15d..89be6c101 100644
--- a/src/qdbus/qdbus/qdbus.cpp
+++ b/src/qdbus/qdbus/qdbus.cpp
@@ -386,7 +386,7 @@ static bool globServices(QDBusConnectionInterface *bus, const QString &glob)
 
     QStringList names = bus->registeredServiceNames();
     names.sort();
-    for (const QString &name : qAsConst(names))
+    for (const QString &name : std::as_const(names))
         if (pattern.match(name).hasMatch())
             printf("%s\n", qPrintable(name));
 
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index f0c35df7d..26b656b65 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -449,7 +449,7 @@ void QDBusViewer::dumpMessage(const QDBusMessage &message)
         out += QLatin1String("&nbsp;&nbsp;(no arguments)");
     } else {
         out += QLatin1String("&nbsp;&nbsp;Arguments: ");
-        for (const QVariant &arg : qAsConst(args)) {
+        for (const QVariant &arg : std::as_const(args)) {
             QString str = QDBusUtil::argumentToString(arg).toHtmlEscaped();
             // turn object paths into clickable links
             str.replace(objectPathRegExp, QLatin1String("[ObjectPath: <a href=\"qdbus://bus\\1\">\\1</a>]"));
diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/aggregate.cpp
index 06adb4891..2d3be6c4c 100644
--- a/src/qdoc/aggregate.cpp
+++ b/src/qdoc/aggregate.cpp
@@ -209,7 +209,7 @@ FunctionNode *Aggregate::findFunctionChild(const FunctionNode *clone)
  */
 void Aggregate::markUndocumentedChildrenInternal()
 {
-    for (auto *child : qAsConst(m_children)) {
+    for (auto *child : std::as_const(m_children)) {
         if (!child->isSharingComment() && !child->hasDoc() && !child->isDontDocument()) {
             if (!child->docMustBeGenerated()) {
                 if (child->isFunction()) {
@@ -275,7 +275,7 @@ void Aggregate::normalizeOverloads()
         }
     }
 
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (node->isAggregate())
             static_cast<Aggregate *>(node)->normalizeOverloads();
     }
@@ -512,7 +512,7 @@ void Aggregate::adoptChild(Node *child)
 void Aggregate::setOutputSubdirectory(const QString &t)
 {
     Node::setOutputSubdirectory(t);
-    for (auto *node : qAsConst(m_children))
+    for (auto *node : std::as_const(m_children))
         node->setOutputSubdirectory(t);
 }
 
@@ -523,7 +523,7 @@ void Aggregate::setOutputSubdirectory(const QString &t)
 QmlPropertyNode *Aggregate::hasQmlProperty(const QString &n) const
 {
     NodeType goal = Node::QmlProperty;
-    for (auto *child : qAsConst(m_children)) {
+    for (auto *child : std::as_const(m_children)) {
         if (child->nodeType() == goal) {
             if (child->name() == n)
                 return static_cast<QmlPropertyNode *>(child);
@@ -539,7 +539,7 @@ QmlPropertyNode *Aggregate::hasQmlProperty(const QString &n) const
 QmlPropertyNode *Aggregate::hasQmlProperty(const QString &n, bool attached) const
 {
     NodeType goal = Node::QmlProperty;
-    for (auto *child : qAsConst(m_children)) {
+    for (auto *child : std::as_const(m_children)) {
         if (child->nodeType() == goal) {
             if (child->name() == n && child->isAttached() == attached)
                 return static_cast<QmlPropertyNode *>(child);
@@ -606,7 +606,7 @@ void Aggregate::findAllFunctions(NodeMapMap &functionIndex)
             fn = fn->nextOverload();
         }
     }
-    for (Node *node : qAsConst(m_children)) {
+    for (Node *node : std::as_const(m_children)) {
         if (node->isAggregate() && !node->isPrivate() && !node->isDontDocument())
             static_cast<Aggregate *>(node)->findAllFunctions(functionIndex);
     }
@@ -628,7 +628,7 @@ void Aggregate::findAllFunctions(NodeMapMap &functionIndex)
   */
 void Aggregate::findAllNamespaces(NodeMultiMap &namespaces)
 {
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (node->isAggregate() && !node->isPrivate()) {
             if (node->isNamespace() && !node->name().isEmpty())
                 namespaces.insert(node->name(), node);
@@ -660,7 +660,7 @@ bool Aggregate::hasObsoleteMembers() const
  */
 void Aggregate::findAllObsoleteThings()
 {
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (!node->isPrivate()) {
             QString name = node->name();
             if (node->isDeprecated()) {
@@ -691,7 +691,7 @@ void Aggregate::findAllObsoleteThings()
  */
 void Aggregate::findAllClasses()
 {
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (!node->isPrivate() && !node->isInternal() && !node->isDontDocument()
             && node->tree()->camelCaseModuleName() != QString("QDoc")) {
             if (node->isClassNode()) {
@@ -720,7 +720,7 @@ void Aggregate::findAllClasses()
  */
 void Aggregate::findAllAttributions(NodeMultiMap &attributions)
 {
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (!node->isPrivate()) {
             if (node->isPageNode() && static_cast<PageNode*>(node)->isAttribution())
                 attributions.insert(node->tree()->indexTitle(), node);
@@ -740,7 +740,7 @@ void Aggregate::findAllAttributions(NodeMultiMap &attributions)
  */
 void Aggregate::findAllSince()
 {
-    for (auto *node : qAsConst(m_children)) {
+    for (auto *node : std::as_const(m_children)) {
         if (node->isRelatedNonmember() && node->parent() != this)
             continue;
         QString sinceString = node->since();
@@ -795,7 +795,7 @@ void Aggregate::findAllSince()
 void Aggregate::resolveQmlInheritance()
 {
     NodeMap previousSearches;
-    for (auto *child : qAsConst(m_children)) {
+    for (auto *child : std::as_const(m_children)) {
         if (!child->isQmlType())
             continue;
         static_cast<QmlTypeNode *>(child)->resolveInheritance(previousSearches);
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index d2d72abfe..3cf930f36 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -290,7 +290,7 @@ static Node *findNodeForCursor(QDocDatabase *qdb, CXCursor cur)
         auto numArg = clang_getNumArgTypes(funcType);
         bool isVariadic = clang_isFunctionTypeVariadic(funcType);
         QVarLengthArray<QString, 20> args;
-        for (Node *candidate : qAsConst(candidates)) {
+        for (Node *candidate : std::as_const(candidates)) {
             if (!candidate->isFunction(Node::CPP))
                 continue;
             auto fn = static_cast<FunctionNode *>(candidate);
@@ -1056,7 +1056,7 @@ void ClangCodeParser::initializeParser()
     args.append(Utilities::getInternalIncludePaths(QStringLiteral("clang++")));
 #endif
     m_includePaths.clear();
-    for (const auto &path : qAsConst(args)) {
+    for (const auto &path : std::as_const(args)) {
         if (!path.isEmpty())
             m_includePaths.append(path.toUtf8());
     }
@@ -1182,7 +1182,7 @@ void ClangCodeParser::getDefaultArgs()
     m_args.clear();
     m_args.insert(m_args.begin(), std::begin(defaultArgs_), std::end(defaultArgs_));
     // Add the defines from the qdocconf file.
-    for (const auto &p : qAsConst(m_defines))
+    for (const auto &p : std::as_const(m_defines))
         m_args.push_back(p.constData());
 }
 
@@ -1363,7 +1363,7 @@ void ClangCodeParser::precompileHeaders()
 {
     getDefaultArgs();
     getMoreArgs();
-    for (const auto &p : qAsConst(m_moreArgs))
+    for (const auto &p : std::as_const(m_moreArgs))
         m_args.push_back(p.constData());
 
     flags_ = static_cast<CXTranslationUnit_Flags>(CXTranslationUnit_Incomplete
@@ -1411,7 +1411,7 @@ void ClangCodeParser::parseSourceFile(const Location & /*location*/, const QStri
         m_args.push_back(m_pchName.constData());
     }
     getMoreArgs();
-    for (const auto &p : qAsConst(m_moreArgs))
+    for (const auto &p : std::as_const(m_moreArgs))
         m_args.push_back(p.constData());
 
     CXTranslationUnit tu;
@@ -1578,7 +1578,7 @@ Node *ClangCodeParser::parseFnArg(const Location &location, const QString &fnSig
 
     std::vector<const char *> args(std::begin(defaultArgs_), std::end(defaultArgs_));
     // Add the defines from the qdocconf file.
-    for (const auto &p : qAsConst(m_defines))
+    for (const auto &p : std::as_const(m_defines))
         args.push_back(p.constData());
     if (!m_pchName.isEmpty()) {
         args.push_back("-w");
@@ -1587,7 +1587,7 @@ Node *ClangCodeParser::parseFnArg(const Location &location, const QString &fnSig
     }
     CXTranslationUnit tu;
     s_fn.clear();
-    for (const auto &ns : qAsConst(m_namespaceScope))
+    for (const auto &ns : std::as_const(m_namespaceScope))
         s_fn.prepend("namespace " + ns.toUtf8() + " {");
     s_fn += fnSignature.toUtf8();
     if (!s_fn.endsWith(";"))
diff --git a/src/qdoc/classnode.cpp b/src/qdoc/classnode.cpp
index c092781ae..f6de10f78 100644
--- a/src/qdoc/classnode.cpp
+++ b/src/qdoc/classnode.cpp
@@ -274,7 +274,7 @@ void ClassNode::removePrivateAndInternalBases()
  */
 void ClassNode::resolvePropertyOverriddenFromPtrs(PropertyNode *pn)
 {
-    for (const auto &baseClass : qAsConst(baseClasses())) {
+    for (const auto &baseClass : std::as_const(baseClasses())) {
         ClassNode *cn = baseClass.m_node;
         if (cn) {
             Node *n = cn->findNonfunctionChild(pn->name(), &Node::isProperty);
diff --git a/src/qdoc/codemarker.cpp b/src/qdoc/codemarker.cpp
index ffeb9072c..4f83c6ee2 100644
--- a/src/qdoc/codemarker.cpp
+++ b/src/qdoc/codemarker.cpp
@@ -58,7 +58,7 @@ void CodeMarker::terminateMarker()
 void CodeMarker::initialize()
 {
     s_defaultLang = Config::instance().getString(CONFIG_LANGUAGE);
-    for (const auto &marker : qAsConst(s_markers))
+    for (const auto &marker : std::as_const(s_markers))
         marker->initializeMarker();
 }
 
@@ -67,7 +67,7 @@ void CodeMarker::initialize()
  */
 void CodeMarker::terminate()
 {
-    for (const auto &marker : qAsConst(s_markers))
+    for (const auto &marker : std::as_const(s_markers))
         marker->terminateMarker();
 }
 
@@ -77,7 +77,7 @@ CodeMarker *CodeMarker::markerForCode(const QString &code)
     if (defaultMarker != nullptr && defaultMarker->recognizeCode(code))
         return defaultMarker;
 
-    for (const auto &marker : qAsConst(s_markers)) {
+    for (const auto &marker : std::as_const(s_markers)) {
         if (marker->recognizeCode(code))
             return marker;
     }
@@ -93,7 +93,7 @@ CodeMarker *CodeMarker::markerForFileName(const QString &fileName)
         QString ext = fileName.mid(dot + 1);
         if (defaultMarker != nullptr && defaultMarker->recognizeExtension(ext))
             return defaultMarker;
-        for (const auto &marker : qAsConst(s_markers)) {
+        for (const auto &marker : std::as_const(s_markers)) {
             if (marker->recognizeExtension(ext))
                 return marker;
         }
@@ -104,7 +104,7 @@ CodeMarker *CodeMarker::markerForFileName(const QString &fileName)
 
 CodeMarker *CodeMarker::markerForLanguage(const QString &lang)
 {
-    for (const auto &marker : qAsConst(s_markers)) {
+    for (const auto &marker : std::as_const(s_markers)) {
         if (marker->recognizeLanguage(lang))
             return marker;
     }
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp
index 00a962ec2..72d1139e4 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/codeparser.cpp
@@ -66,7 +66,7 @@ void CodeParser::parseHeaderFile(const Location &location, const QString &filePa
  */
 void CodeParser::initialize()
 {
-    for (const auto &parser : qAsConst(s_parsers))
+    for (const auto &parser : std::as_const(s_parsers))
         parser->initializeParser();
 }
 
@@ -81,7 +81,7 @@ void CodeParser::terminate()
 
 CodeParser *CodeParser::parserForLanguage(const QString &language)
 {
-    for (const auto parser : qAsConst(s_parsers)) {
+    for (const auto parser : std::as_const(s_parsers)) {
         if (parser->language() == language)
             return parser;
     }
@@ -92,7 +92,7 @@ CodeParser *CodeParser::parserForHeaderFile(const QString &filePath)
 {
     QString fileName = QFileInfo(filePath).fileName();
 
-    for (const auto &parser : qAsConst(s_parsers)) {
+    for (const auto &parser : std::as_const(s_parsers)) {
         const QStringList headerPatterns = parser->headerFileNameFilter();
         for (const auto &pattern : headerPatterns) {
             auto re = QRegularExpression::fromWildcard(pattern, Qt::CaseInsensitive);
diff --git a/src/qdoc/collectionnode.cpp b/src/qdoc/collectionnode.cpp
index 6afa01e94..d7a6cea42 100644
--- a/src/qdoc/collectionnode.cpp
+++ b/src/qdoc/collectionnode.cpp
@@ -51,7 +51,7 @@ bool CollectionNode::hasClasses() const
 void CollectionNode::getMemberNamespaces(NodeMap &out)
 {
     out.clear();
-    for (const auto &member : qAsConst(m_members)) {
+    for (const auto &member : std::as_const(m_members)) {
         if (member->isNamespace() && member->isInAPI())
             out.insert(member->name(), member);
     }
@@ -64,7 +64,7 @@ void CollectionNode::getMemberNamespaces(NodeMap &out)
 void CollectionNode::getMemberClasses(NodeMap &out) const
 {
     out.clear();
-    for (const auto &member : qAsConst(m_members)) {
+    for (const auto &member : std::as_const(m_members)) {
         if (member->isClassNode() && member->isInAPI())
             out.insert(member->name(), member);
     }
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index 83c9b509f..2b2994a02 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -813,7 +813,7 @@ QString Config::getExampleProjectFile(const QString &examplePath)
 
     QString projectFile;
 
-    for (const auto &name : qAsConst(validNames)) {
+    for (const auto &name : std::as_const(validNames)) {
         projectFile = Config::findFile(Location(), m_exampleFiles, m_exampleDirs,
                                        examplePath + QLatin1Char('/') + name);
         if (!projectFile.isEmpty())
@@ -1352,7 +1352,7 @@ QStringList Config::getFilesHere(const QString &uncleanDir, const QString &nameF
     dirInfo.setSorting(QDir::Name);
     dirInfo.setFilter(QDir::Files);
     QStringList fileNames = dirInfo.entryList();
-    for (const auto &file : qAsConst(fileNames)) {
+    for (const auto &file : std::as_const(fileNames)) {
         // TODO: Understand if this is needed and, should it be, if it
         // is indeed the only case that should be considered.
         if (!file.startsWith(QLatin1Char('~'))) {
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index 7cca45ca6..5dbd7d59a 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -900,7 +900,7 @@ void CppCodeParser::processTopicArgs(const Doc &doc, const QString &topic, NodeL
             }
         } else if (args.size() > 1) {
             QList<SharedCommentNode *> sharedCommentNodes;
-            for (const auto &arg : qAsConst(args)) {
+            for (const auto &arg : std::as_const(args)) {
                 node = nullptr;
                 if (topic == COMMAND_FN) {
                     if (showInternal() || !doc.isInternal())
diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp
index c02d6a654..1145f7033 100644
--- a/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/docbookgenerator.cpp
@@ -2468,7 +2468,7 @@ void DocBookGenerator::generateFileList(const ExampleNode *en, bool images)
 
     m_writer->writeStartElement(dbNamespace, "itemizedlist");
 
-    for (const auto &path : qAsConst(paths)) {
+    for (const auto &path : std::as_const(paths)) {
         auto maybe_resolved_file{file_resolver.resolve(path)};
         if (!maybe_resolved_file) {
             // TODO: [uncentralized-admonition][failed-resolve-file]
@@ -3689,7 +3689,7 @@ void DocBookGenerator::generateAddendum(const Node *node, Addendum type, CodeMar
         if (nodes.isEmpty())
             return;
         std::sort(nodes.begin(), nodes.end(), Node::nodeNameLessThan);
-        for (const auto node : qAsConst(nodes)) {
+        for (const auto node : std::as_const(nodes)) {
             QString msg;
             const auto pn = static_cast<const PropertyNode *>(node);
             switch (pn->role(fn)) {
@@ -4315,7 +4315,7 @@ void DocBookGenerator::generateProxyPage(Aggregate *aggregate)
     Sections sections(aggregate);
     SectionVector *detailsSections = &sections.stdDetailsSections();
 
-    for (const auto &section : qAsConst(*detailsSections)) {
+    for (const auto &section : std::as_const(*detailsSections)) {
         if (section.isEmpty())
             continue;
 
diff --git a/src/qdoc/docparser.cpp b/src/qdoc/docparser.cpp
index 4e9e1c8d8..4d562023b 100644
--- a/src/qdoc/docparser.cpp
+++ b/src/qdoc/docparser.cpp
@@ -1391,7 +1391,7 @@ void DocParser::startFormat(const QString &format, int cmd)
 {
     enterPara();
 
-    for (const auto &item : qAsConst(m_pendingFormats)) {
+    for (const auto &item : std::as_const(m_pendingFormats)) {
         if (item == format) {
             location().warning(QStringLiteral("Cannot nest '\\%1' commands").arg(cmdName(cmd)));
             return;
diff --git a/src/qdoc/enumnode.cpp b/src/qdoc/enumnode.cpp
index 555913466..f948b02d6 100644
--- a/src/qdoc/enumnode.cpp
+++ b/src/qdoc/enumnode.cpp
@@ -38,7 +38,7 @@ Access EnumNode::itemAccess(const QString &name) const
  */
 QString EnumNode::itemValue(const QString &name) const
 {
-    for (const auto &item : qAsConst(m_items)) {
+    for (const auto &item : std::as_const(m_items)) {
         if (item.name() == name)
             return item.value();
     }
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index bddab831d..48b3d86d8 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -967,7 +967,7 @@ void Generator::generateFileList(const ExampleNode *en, CodeMarker *marker, bool
     text << Atom::ParaLeft << tag << Atom::ParaRight;
     text << Atom(Atom::ListLeft, openedList.styleString());
 
-    for (const auto &path : qAsConst(paths)) {
+    for (const auto &path : std::as_const(paths)) {
         auto maybe_resolved_file{file_resolver.resolve(path)};
         if (!maybe_resolved_file) {
             // TODO: [uncentralized-admonition][failed-resolve-file]
@@ -1292,7 +1292,7 @@ void Generator::generateAddendum(const Node *node, Addendum type, CodeMarker *ma
         if (nodes.isEmpty())
             return;
         std::sort(nodes.begin(), nodes.end(), Node::nodeNameLessThan);
-        for (const auto *n : qAsConst(nodes)) {
+        for (const auto *n : std::as_const(nodes)) {
             QString msg;
             const auto *pn = static_cast<const PropertyNode *>(n);
             switch (pn->role(fn)) {
@@ -1553,7 +1553,7 @@ void Generator::generateDocs()
 
 Generator *Generator::generatorForFormat(const QString &format)
 {
-    for (const auto &generator : qAsConst(s_generators)) {
+    for (const auto &generator : std::as_const(s_generators)) {
         if (generator->format() == format)
             return generator;
     }
@@ -2000,7 +2000,7 @@ void Generator::supplementAlsoList(const Node *node, QList<Text> &alsoList)
 
 void Generator::terminate()
 {
-    for (const auto &generator : qAsConst(s_generators)) {
+    for (const auto &generator : std::as_const(s_generators)) {
         if (s_outputFormats.contains(generator->format()))
             generator->terminateGenerator();
     }
diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp
index a6d54594b..744c4277e 100644
--- a/src/qdoc/helpprojectwriter.cpp
+++ b/src/qdoc/helpprojectwriter.cpp
@@ -144,7 +144,7 @@ void HelpProjectWriter::readSelectors(SubProject &subproject, const QStringList
         subproject.m_selectors << typeHash.value(typeName);
         if (!pieces.isEmpty()) {
             pieces = pieces[0].split(QLatin1Char(','));
-            for (const auto &piece : qAsConst(pieces)) {
+            for (const auto &piece : std::as_const(pieces)) {
                 if (typeHash[typeName] == Node::Group
                     || typeHash[typeName] == Node::Module
                     || typeHash[typeName] == Node::QmlModule) {
@@ -440,7 +440,7 @@ void HelpProjectWriter::generateSections(HelpProject &project, QXmlStreamWriter
                     childSet << child;
             }
         }
-        for (const auto *child : qAsConst(childSet))
+        for (const auto *child : std::as_const(childSet))
             generateSections(project, writer, child);
     }
 }
@@ -596,7 +596,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
         writer.writeAttribute("name", it.key());
         QStringList sortedAttributes = it.value().values();
         sortedAttributes.sort();
-        for (const auto &filter : qAsConst(sortedAttributes))
+        for (const auto &filter : std::as_const(sortedAttributes))
             writer.writeTextElement("filterAttribute", filter);
         writer.writeEndElement(); // customFilter
     }
@@ -607,7 +607,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
     // Write filterAttribute elements.
     QStringList sortedFilterAttributes = project.m_filterAttributes.values();
     sortedFilterAttributes.sort();
-    for (const auto &filterName : qAsConst(sortedFilterAttributes))
+    for (const auto &filterName : std::as_const(sortedFilterAttributes))
         writer.writeTextElement("filterAttribute", filterName);
 
     writer.writeStartElement("toc");
@@ -690,14 +690,14 @@ void HelpProjectWriter::generateProject(HelpProject &project)
             if (subproject.m_sortPages) {
                 QStringList titles = subproject.m_nodes.keys();
                 titles.sort();
-                for (const auto &title : qAsConst(titles)) {
+                for (const auto &title : std::as_const(titles)) {
                     writeNode(project, writer, subproject.m_nodes[title]);
                 }
             } else {
                 // Find a contents node and navigate from there, using the NextLink values.
                 QSet<QString> visited;
                 bool contentsFound = false;
-                for (const auto *node : qAsConst(subproject.m_nodes)) {
+                for (const auto *node : std::as_const(subproject.m_nodes)) {
                     QString nextTitle = node->links().value(Node::NextLink).first;
                     if (!nextTitle.isEmpty()
                         && node->links().value(Node::ContentsLink).first.isEmpty()) {
@@ -725,7 +725,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
                     std::sort(subnodes.begin(), subnodes.end(), Node::nodeNameLessThan);
 
-                    for (const auto *node : qAsConst(subnodes))
+                    for (const auto *node : std::as_const(subnodes))
                         writeNode(project, writer, node);
                 }
             }
@@ -742,8 +742,8 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
     writer.writeStartElement("keywords");
     std::sort(project.m_keywords.begin(), project.m_keywords.end());
-    for (const auto &k : qAsConst(project.m_keywords)) {
-        for (const auto &id : qAsConst(k.m_ids)) {
+    for (const auto &k : std::as_const(project.m_keywords)) {
+        for (const auto &id : std::as_const(k.m_ids)) {
             writer.writeStartElement("keyword");
             writer.writeAttribute("name", k.m_name);
             writer.writeAttribute("id", id);
@@ -763,7 +763,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
     files.unite(project.m_extraFiles);
     QStringList sortedFiles = files.values();
     sortedFiles.sort();
-    for (const auto &usedFile : qAsConst(sortedFiles)) {
+    for (const auto &usedFile : std::as_const(sortedFiles)) {
         if (!usedFile.isEmpty())
             writer.writeTextElement("file", usedFile);
     }
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index baa9a3bbb..4f859558b 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -1137,7 +1137,7 @@ void HtmlGenerator::generateCppReferencePage(Aggregate *aggregate, CodeMarker *m
 
     bool needOtherSection = false;
 
-    for (const auto &section : qAsConst(*summarySections)) {
+    for (const auto &section : std::as_const(*summarySections)) {
         if (section.members().isEmpty() && section.reimplementedMembers().isEmpty()) {
             if (!section.inheritedMembers().isEmpty())
                 needOtherSection = true;
@@ -1166,7 +1166,7 @@ void HtmlGenerator::generateCppReferencePage(Aggregate *aggregate, CodeMarker *m
         out() << "<h3>Additional Inherited Members</h3>\n"
                  "<ul>\n";
 
-        for (const auto &section : qAsConst(*summarySections)) {
+        for (const auto &section : std::as_const(*summarySections)) {
             if (section.members().isEmpty() && !section.inheritedMembers().isEmpty())
                 generateSectionInheritedList(section, aggregate);
         }
@@ -1194,7 +1194,7 @@ void HtmlGenerator::generateCppReferencePage(Aggregate *aggregate, CodeMarker *m
         generateExtractionMark(aggregate, EndMark);
     }
 
-    for (const auto &section : qAsConst(*detailsSections)) {
+    for (const auto &section : std::as_const(*detailsSections)) {
         bool headerGenerated = false;
         if (section.isEmpty())
             continue;
@@ -1294,7 +1294,7 @@ void HtmlGenerator::generateProxyPage(Aggregate *aggregate, CodeMarker *marker)
         generateExtractionMark(aggregate, EndMark);
     }
 
-    for (const auto &section : qAsConst(*detailsSections)) {
+    for (const auto &section : std::as_const(*detailsSections)) {
         if (section.isEmpty())
             continue;
 
@@ -2308,14 +2308,14 @@ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker
         }
         out() << "<li class=\"level" << sectionNumber << "\"><a href=\"#" << registerRef("details")
               << "\">Detailed Description</a></li>\n";
-        for (const auto &entry : qAsConst(toc)) {
+        for (const auto &entry : std::as_const(toc)) {
             if (entry->string().toInt() == 1) {
                 detailsBase = 1;
                 break;
             }
         }
     } else if (sections && (node->isClassNode() || node->isNamespace() || node->isQmlType() || node->isQmlBasicType())) {
-        for (const auto &section : qAsConst(*sections)) {
+        for (const auto &section : std::as_const(*sections)) {
             if (!section.members().isEmpty()) {
                 openUnorderedList();
                 out() << "<li class=\"level" << sectionNumber << "\"><a href=\"#"
@@ -2642,7 +2642,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative, CodeMarker *mark
     NodeList nodes = nmm.values();
     std::sort(nodes.begin(), nodes.end(), Node::nodeNameLessThan);
 
-    for (const auto *node : qAsConst(nodes)) {
+    for (const auto *node : std::as_const(nodes)) {
         if (++row % 2 == 1)
             out() << "<tr class=\"odd topAlign\">";
         else
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 118ab9031..51ff61946 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -168,7 +168,7 @@ static void loadIndexFiles(const QSet<QString> &formats)
                     */
                     QStringList indexPaths;
                     indexPaths.reserve(foundIndices.size());
-                    for (const auto &found : qAsConst(foundIndices))
+                    for (const auto &found : std::as_const(foundIndices))
                         indexPaths << found.absoluteFilePath();
                     if (warn) {
                         Location().warning(
@@ -646,19 +646,19 @@ int main(int argc, char **argv)
     if (config.singleExec()) {
         // single qdoc process for prepare and generate phases
         config.setQDocPass(Config::Prepare);
-        for (const auto &file : qAsConst(qdocFiles)) {
+        for (const auto &file : std::as_const(qdocFiles)) {
             config.dependModules().clear();
             processQdocconfFile(file);
         }
         config.setQDocPass(Config::Generate);
         QDocDatabase::qdocDB()->processForest();
-        for (const auto &file : qAsConst(qdocFiles)) {
+        for (const auto &file : std::as_const(qdocFiles)) {
             config.dependModules().clear();
             processQdocconfFile(file);
         }
     } else {
         // separate qdoc processes for prepare and generate phases
-        for (const auto &file : qAsConst(qdocFiles)) {
+        for (const auto &file : std::as_const(qdocFiles)) {
             config.dependModules().clear();
             processQdocconfFile(file);
         }
diff --git a/src/qdoc/namespacenode.cpp b/src/qdoc/namespacenode.cpp
index 27daacaf7..22686c050 100644
--- a/src/qdoc/namespacenode.cpp
+++ b/src/qdoc/namespacenode.cpp
@@ -52,7 +52,7 @@ bool NamespaceNode::hasDocumentedChildren() const
  */
 void NamespaceNode::reportDocumentedChildrenInUndocumentedNamespace() const
 {
-    for (const auto *node : qAsConst(m_children)) {
+    for (const auto *node : std::as_const(m_children)) {
         if (node->isInAPI()) {
             QString msg1 = node->name();
             if (node->isFunction())
diff --git a/src/qdoc/parameters.cpp b/src/qdoc/parameters.cpp
index c0cee5e58..39f88b48f 100644
--- a/src/qdoc/parameters.cpp
+++ b/src/qdoc/parameters.cpp
@@ -444,7 +444,7 @@ void Parameters::set(const QString &signature)
         QStringList commaSplit = signature.split(',');
         m_parameters.resize(commaSplit.size());
         int i = 0;
-        for (const auto &item : qAsConst(commaSplit)) {
+        for (const auto &item : std::as_const(commaSplit)) {
             QStringList blankSplit = item.split(' ', Qt::SkipEmptyParts);
             QString pDefault;
             qsizetype defaultIdx = blankSplit.indexOf(QStringLiteral("="));
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 142394366..ce4039eda 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -648,7 +648,7 @@ void QDocIndexFiles::insertTarget(TargetRec::TargetType type,
  */
 void QDocIndexFiles::resolveIndex()
 {
-    for (const auto &pair : qAsConst(m_basesList)) {
+    for (const auto &pair : std::as_const(m_basesList)) {
         const QStringList bases = pair.second.split(QLatin1Char(','));
         for (const auto &base : bases) {
             QStringList basePath = base.split(QString("::"));
diff --git a/src/qdoc/qmltypenode.cpp b/src/qdoc/qmltypenode.cpp
index 10de62307..e187c076b 100644
--- a/src/qdoc/qmltypenode.cpp
+++ b/src/qdoc/qmltypenode.cpp
@@ -125,7 +125,7 @@ void QmlTypeNode::resolveInheritance(NodeMap &previousSearches)
 
     auto *base = static_cast<QmlTypeNode *>(previousSearches.value(m_qmlBaseName));
     if (!previousSearches.contains(m_qmlBaseName)) {
-        for (const auto &import : qAsConst(m_importList)) {
+        for (const auto &import : std::as_const(m_importList)) {
             base = QDocDatabase::qdocDB()->findQmlType(import, m_qmlBaseName);
             if (base)
                 break;
diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index 94e5865c9..ded3da8d4 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -383,7 +383,7 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::SourceLocation, Node *node, Doc &d
     QSet<QString> metacommands = doc.metaCommandsUsed();
     if (metacommands.size() > 0) {
         metacommands.subtract(m_topics);
-        for (const auto &command : qAsConst(metacommands)) {
+        for (const auto &command : std::as_const(metacommands)) {
             const ArgList args = doc.metaCommandArgs(command);
             if ((command == COMMAND_QMLABSTRACT) || (command == COMMAND_ABSTRACT)) {
                 if (node->isQmlType()) {
diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp
index bccece9f9..8037fa5b4 100644
--- a/src/qdoc/tree.cpp
+++ b/src/qdoc/tree.cpp
@@ -563,7 +563,7 @@ const Node *Tree::matchPathAndTarget(const QStringList &path, int idx, const QSt
     if (node->isAggregate()) {
         NodeVector nodes;
         static_cast<const Aggregate *>(node)->findChildren(name, nodes);
-        for (const auto *child : qAsConst(nodes)) {
+        for (const auto *child : std::as_const(nodes)) {
             if (genus != Node::DontCare && !(genus & child->genus()))
                 continue;
             const Node *t = matchPathAndTarget(path, idx + 1, target, child, flags, genus, ref);
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index cf419651d..741b7ed64 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -48,7 +48,7 @@ static void validatePackage(Package &p, const QString &filePath, LogLevel logLev
                       << std::endl;
         }
 
-        for (const QString &part : qAsConst(p.qtParts)) {
+        for (const QString &part : std::as_const(p.qtParts)) {
             if (part != QLatin1String("examples")
                     && part != QLatin1String("tests")
                     && part != QLatin1String("tools")
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index d99fb3839..475c076b3 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -215,7 +215,7 @@ void dumpGlInfo(QTextStream &str, bool listExtensions)
             QByteArrayList extensionList = context.extensions().values();
             std::sort(extensionList.begin(), extensionList.end());
             str << " \nFound " << extensionList.size() << " extensions:\n";
-            for (const QByteArray &extension : qAsConst(extensionList))
+            for (const QByteArray &extension : std::as_const(extensionList))
                 str << "  " << extension << '\n';
         }
     } else {
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index dc70bf2ae..b83e96d40 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -503,14 +503,14 @@ void DeviceSkin::paintEvent( QPaintEvent *)
     if ( buttonPressed == true ) {
         toDraw += buttonIndex;
     }
-    for (int toggle : qAsConst(m_parameters.toggleAreaList)) {
+    for (int toggle : std::as_const(m_parameters.toggleAreaList)) {
         const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[toggle];
         if (flipped_open || ba.activeWhenClosed) {
             if (ba.toggleArea && ba.toggleActiveArea)
                 toDraw += toggle;
         }
     }
-    for (int button : qAsConst(toDraw)) {
+    for (int button : std::as_const(toDraw)) {
         const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[button];
         const QRect r = buttonRegions[button].boundingRect();
         if ( ba.area.size() > 2 )
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index 08a6df1e2..254414a0e 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -45,7 +45,7 @@ static QIcon createIconSet(const QString &name)
         << (QString::fromUtf8(":/qt-project.org/shared/images/win/") + name);
 #endif
 
-    for (const QString &f : qAsConst(candidates)) {
+    for (const QString &f : std::as_const(candidates)) {
         if (QFile::exists(f))
             return QIcon(f);
     }
diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp
index 8e02be30f..b8e5e0bcf 100644
--- a/src/shared/fontpanel/fontpanel.cpp
+++ b/src/shared/fontpanel/fontpanel.cpp
@@ -30,7 +30,7 @@ FontPanel::FontPanel(QWidget *parentWidget) :
 
     auto writingSystems = QFontDatabase::writingSystems();
     writingSystems.push_front(QFontDatabase::Any);
-    for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems))
+    for (QFontDatabase::WritingSystem ws : std::as_const(writingSystems))
         m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws));
     connect(m_writingSystemComboBox, &QComboBox::currentIndexChanged,
             this, &FontPanel::slotWritingSystemChanged);
@@ -241,7 +241,7 @@ void FontPanel::updatePointSizes(const QString &family, const QString &styleStri
     //  try to maintain selection or select closest.
     if (hasSizes) {
         QString n;
-        for (int pointSize : qAsConst(pointSizes))
+        for (int pointSize : std::as_const(pointSizes))
             m_pointSizeComboBox->addItem(n.setNum(pointSize), QVariant(pointSize));
         const int closestIndex = closestPointSizeIndex(oldPointSize);
         if (closestIndex != -1)
diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
index 809a304bd..5be4aa87a 100644
--- a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp
@@ -630,7 +630,7 @@ void QtGradientStopsWidget::mouseMoveEvent(QMouseEvent *e)
         double x1 = d_ptr->fromViewport(xv1);
         double x2 = d_ptr->fromViewport(xv2);
 
-        for (QtGradientStop *stop : qAsConst(d_ptr->m_stops)) {
+        for (QtGradientStop *stop : std::as_const(d_ptr->m_stops)) {
             if ((stop->position() >= x1 && stop->position() <= x2) ||
                         beginList.contains(stop) || endList.contains(stop))
                 d_ptr->m_model->selectStop(stop, true);
diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
index 2f42906ed..60ff786f7 100644
--- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
@@ -87,7 +87,7 @@ int QtButtonPropertyBrowserPrivate::gridRow(WidgetItem *item) const
         siblings = m_children;
 
     int row = 0;
-    for (WidgetItem *sibling : qAsConst(siblings)) {
+    for (WidgetItem *sibling : std::as_const(siblings)) {
         if (sibling == item)
             return row;
         row += gridSpan(sibling);
@@ -124,7 +124,7 @@ void QtButtonPropertyBrowserPrivate::slotEditorDestroyed()
 
 void QtButtonPropertyBrowserPrivate::slotUpdate()
 {
-    for (WidgetItem *item : qAsConst(m_recreateQueue)) {
+    for (WidgetItem *item : std::as_const(m_recreateQueue)) {
         WidgetItem *parent = item->parent;
         QWidget *w = nullptr;
         QGridLayout *l = nullptr;
diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
index ae5375479..29e994089 100644
--- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
@@ -77,7 +77,7 @@ void QtGroupBoxPropertyBrowserPrivate::slotEditorDestroyed()
 
 void QtGroupBoxPropertyBrowserPrivate::slotUpdate()
 {
-    for (WidgetItem *item : qAsConst(m_recreateQueue)) {
+    for (WidgetItem *item : std::as_const(m_recreateQueue)) {
         WidgetItem *par = item->parent;
         QWidget *w = nullptr;
         QGridLayout *l = nullptr;
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
index 61ead456b..1be34a1dd 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
@@ -125,15 +125,15 @@ QtProperty::QtProperty(QtAbstractPropertyManager *manager)
 */
 QtProperty::~QtProperty()
 {
-    for (QtProperty *property : qAsConst(d_ptr->m_parentItems))
+    for (QtProperty *property : std::as_const(d_ptr->m_parentItems))
         property->d_ptr->m_manager->d_ptr->propertyRemoved(this, property);
 
     d_ptr->m_manager->d_ptr->propertyDestroyed(this);
 
-    for (QtProperty *property : qAsConst(d_ptr->m_subItems))
+    for (QtProperty *property : std::as_const(d_ptr->m_subItems))
         property->d_ptr->m_parentItems.remove(this);
 
-    for (QtProperty *property : qAsConst(d_ptr->m_parentItems))
+    for (QtProperty *property : std::as_const(d_ptr->m_parentItems))
         property->d_ptr->m_subItems.removeAll(this);
 }
 
@@ -1348,7 +1348,7 @@ void QtAbstractPropertyBrowserPrivate::removeBrowserIndexes(QtProperty *property
             toRemove.append(idx);
     }
 
-    for (QtBrowserItem *index : qAsConst(toRemove))
+    for (QtBrowserItem *index : std::as_const(toRemove))
         removeBrowserIndex(index);
 }
 
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.h b/src/shared/qtpropertybrowser/qtpropertybrowser.h
index 243ff0436..d60758ef3 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.h
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.h
@@ -112,7 +112,7 @@ public:
     explicit QtAbstractEditorFactory(QObject *parent) : QtAbstractEditorFactoryBase(parent) {}
     QWidget *createEditor(QtProperty *property, QWidget *parent) override
     {
-        for (PropertyManager *manager : qAsConst(m_managers)) {
+        for (PropertyManager *manager : std::as_const(m_managers)) {
             if (manager == property->propertyManager()) {
                 return createEditor(manager, property, parent);
             }
@@ -144,7 +144,7 @@ public:
     PropertyManager *propertyManager(QtProperty *property) const
     {
         QtAbstractPropertyManager *manager = property->propertyManager();
-        for (PropertyManager *m : qAsConst(m_managers)) {
+        for (PropertyManager *m : std::as_const(m_managers)) {
             if (m == manager) {
                 return m;
             }
@@ -158,7 +158,7 @@ protected:
     virtual void disconnectPropertyManager(PropertyManager *manager) = 0;
     void managerDestroyed(QObject *manager) override
     {
-        for (PropertyManager *m : qAsConst(m_managers)) {
+        for (PropertyManager *m : std::as_const(m_managers)) {
             if (m == manager) {
                 m_managers.remove(m);
                 return;
@@ -168,7 +168,7 @@ protected:
 private:
     void breakConnection(QtAbstractPropertyManager *manager) override
     {
-        for (PropertyManager *m : qAsConst(m_managers)) {
+        for (PropertyManager *m : std::as_const(m_managers)) {
             if (m == manager) {
                 removePropertyManager(m);
                 return;
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
index 7a414e4d4..18dd16a0e 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -410,7 +410,7 @@ void QtMetaEnumProvider::initLocale()
             m_languageToIndex[language] = langIdx;
             QStringList territoryNames;
             int territoryIdx = 0;
-            for (QLocale::Territory territory : qAsConst(territories)) {
+            for (QLocale::Territory territory : std::as_const(territories)) {
                 territoryNames << QLocale::territoryToString(territory);
                 m_indexToTerritory[langIdx][territoryIdx] = territory;
                 m_territoryToIndex[language][territory] = territoryIdx;
@@ -5101,7 +5101,7 @@ void QtFlagPropertyManager::setFlagNames(QtProperty *property, const QStringList
 
     const auto pfit = d_ptr->m_propertyToFlags.find(property);
     if (pfit != d_ptr->m_propertyToFlags.end()) {
-        for (QtProperty *prop : qAsConst(pfit.value())) {
+        for (QtProperty *prop : std::as_const(pfit.value())) {
             if (prop) {
                 delete prop;
                 d_ptr->m_flagToProperty.remove(prop);
@@ -5141,7 +5141,7 @@ void QtFlagPropertyManager::uninitializeProperty(QtProperty *property)
 {
     const auto it = d_ptr->m_propertyToFlags.find(property);
     if (it != d_ptr->m_propertyToFlags.end()) {
-        for (QtProperty *prop : qAsConst(it.value()))  {
+        for (QtProperty *prop : std::as_const(it.value()))  {
             if (prop) {
                 d_ptr->m_flagToProperty.remove(prop);
                 delete prop;
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index 340a557bf..63ebb1edb 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -160,7 +160,7 @@ void QtFullToolBarManagerPrivate::removeWidgetActions(const QMap<QToolBar *, QLi
 
         toolBars.insert(toolBar, newActions);
         toolBarsWithSeparators.insert(toolBar, newActionsWithSeparators);
-        for (QAction *oldAction : qAsConst(removedActions)) {
+        for (QAction *oldAction : std::as_const(removedActions)) {
             widgetActions.insert(oldAction, 0);
             actionToToolBars[oldAction].removeAll(toolBar);
         }
@@ -312,7 +312,7 @@ bool QtFullToolBarManagerPrivate::restoreState(QDataStream &stream) const
             q_ptr->setToolBar(toolBar, actions);
         }
     }
-    for (QToolBar *toolBar : qAsConst(oldCustomToolBars))
+    for (QToolBar *toolBar : std::as_const(oldCustomToolBars))
         q_ptr->deleteToolBar(toolBar);
     return true;
 }
@@ -648,7 +648,7 @@ void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QList<QAction *>
     }
 
     QList<QAction *> newActionsWithSeparators;
-    for (QAction *action : qAsConst(newActions)) {
+    for (QAction *action : std::as_const(newActions)) {
         QAction *newAction = nullptr;
         if (!action)
             newAction = toolBar->insertSeparator(0);
@@ -1184,7 +1184,7 @@ void QtToolBarDialogPrivate::removeToolBar(ToolBarItem *item)
     int row = ui.toolBarList->row(i);
     const auto itToolBar = toolBarToWidgetActions.find(item);
     if (itToolBar != toolBarToWidgetActions.end()) {
-        for (QAction *action : qAsConst(itToolBar.value()))
+        for (QAction *action : std::as_const(itToolBar.value()))
             widgetActionToToolBar.insert(action, 0);
         toolBarToWidgetActions.erase(itToolBar);
     }
@@ -1228,7 +1228,7 @@ void QtToolBarDialogPrivate::defaultClicked()
 
         const auto tbwit = toolBarToWidgetActions.find(toolBarItem);
         if (tbwit != toolBarToWidgetActions.end()) {
-            for (QAction *action : qAsConst(tbwit.value()))
+            for (QAction *action : std::as_const(tbwit.value()))
                 widgetActionToToolBar.insert(action, 0);
             toolBarToWidgetActions.erase(tbwit);
         }
diff --git a/tests/auto/linguist/lconvert/tst_lconvert.cpp b/tests/auto/linguist/lconvert/tst_lconvert.cpp
index 99141b514..e20d14535 100644
--- a/tests/auto/linguist/lconvert/tst_lconvert.cpp
+++ b/tests/auto/linguist/lconvert/tst_lconvert.cpp
@@ -145,10 +145,10 @@ void tst_lconvert::convertChain(const QString &_inFileName, const QString &_outF
         args << "-if" << stations[i] << "-i" << "-" << "-of" << stations[i + 1];
         cvts.at(i)->start(lconvert, args, QIODevice::ReadWrite | QIODevice::Text);
     }
-    for (QProcess *cvt : qAsConst(cvts))
+    for (QProcess *cvt : std::as_const(cvts))
         QVERIFY2(cvt->waitForStarted(), qPrintable(cvt->errorString()));
     int st = 0;
-    for (QProcess *cvt : qAsConst(cvts))
+    for (QProcess *cvt : std::as_const(cvts))
         doWait(cvt, ++st);
 
     if (!QTest::currentTestFailed())
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp
index eecba1d73..6e04417aa 100644
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
@@ -281,7 +281,7 @@ void tst_lupdate::good()
         file.close();
     }
 
-    for (const QString &ts : qAsConst(generatedtsfiles)) {
+    for (const QString &ts : std::as_const(generatedtsfiles)) {
         QString genTs = workDir + QLatin1Char('/') + ts;
         QFile::remove(genTs);
         QString beforetsfile = dir + QLatin1Char('/') + ts + QLatin1String(".before");
@@ -330,7 +330,7 @@ void tst_lupdate::good()
             return;
     }
 
-    for (const QString &ts : qAsConst(generatedtsfiles)) {
+    for (const QString &ts : std::as_const(generatedtsfiles)) {
         if (dir.endsWith("preprocess_clang_parser")) {
             doCompare(workDir + QLatin1Char('/') + ts,
                       dir + QLatin1Char('/') + ts + QLatin1String(".result"), true);
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
index f459152e7..07d89c51a 100644
--- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
+++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp
@@ -172,7 +172,7 @@ void tst_generatedOutput::testAndCompare(const char *input, const char *outNames
 
     if (m_regen) {
         QVERIFY(m_expectedDir.mkpath(m_expectedDir.path()));
-        for (const auto &file : qAsConst(expectedOuts)) {
+        for (const auto &file : std::as_const(expectedOuts)) {
             QFileInfo fileInfo(m_expectedDir.filePath(file));
             fileInfo.dir().remove(fileInfo.fileName()); // Allowed to fail
             QVERIFY(m_expectedDir.mkpath(fileInfo.dir().path()));