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, with manual unstaging of the actual definition and documentation in dist/, src/corelib/doc/ and src/corelib/global/. Task-number: QTBUG-99313 Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
author: Marc Mutz <marc.mutz@qt.io> 2022-10-06 11:08:21 +0200
committer: Marc Mutz <marc.mutz@qt.io> 2022-10-11 23:17:18 +0200
commit: aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch)
tree: be5e1a9733987aed8602eb47618cd1673a594570 /src
parent: fd2685c2f0a219c091e028a98ba6cdd154986fec (diff)
171 files changed, 433 insertions, 433 deletions
diff --git a/src/corelib/global/qforeach.h b/src/corelib/global/qforeach.h
index 228c128fa8..ab0e20b989 100644
--- a/src/corelib/global/qforeach.h
+++ b/src/corelib/global/qforeach.h
@@ -25,8 +25,8 @@ template <typename T>
 class QForeachContainer {
     Q_DISABLE_COPY_MOVE(QForeachContainer)
 public:
-    QForeachContainer(const T &t) : c(t), i(qAsConst(c).begin()), e(qAsConst(c).end()) {}
-    QForeachContainer(T &&t) : c(std::move(t)), i(qAsConst(c).begin()), e(qAsConst(c).end())  {}
+    QForeachContainer(const T &t) : c(t), i(std::as_const(c).begin()), e(std::as_const(c).end()) {}
+    QForeachContainer(T &&t) : c(std::move(t)), i(std::as_const(c).begin()), e(std::as_const(c).end())  {}
 
     T c;
     typename T::const_iterator i, e;
diff --git a/src/corelib/global/qforeach.qdoc b/src/corelib/global/qforeach.qdoc
index 278f1a1007..632c9dd676 100644
--- a/src/corelib/global/qforeach.qdoc
+++ b/src/corelib/global/qforeach.qdoc
@@ -54,9 +54,9 @@
 
     \note Since Qt 5.7, the use of this macro is discouraged. It will
     be removed in a future version of Qt. Please use C++11 range-for,
-    possibly with qAsConst(), as needed.
+    possibly with std::as_const(), as needed.
 
-    \sa qAsConst()
+    \sa std::as_const()
 */
 
 /*!
@@ -70,7 +70,7 @@
 
     \note Since Qt 5.7, the use of this macro is discouraged. It will
     be removed in a future version of Qt. Please use C++11 range-for,
-    possibly with qAsConst(), as needed.
+    possibly with std::as_const(), as needed.
 
-    \sa qAsConst()
+    \sa std::as_const()
 */
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index eef21b2fd4..3b53b490f5 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -223,7 +223,7 @@ QInotifyFileSystemWatcherEngine::QInotifyFileSystemWatcherEngine(int fd, QObject
 QInotifyFileSystemWatcherEngine::~QInotifyFileSystemWatcherEngine()
 {
     notifier.setEnabled(false);
-    for (int id : qAsConst(pathToID))
+    for (int id : std::as_const(pathToID))
         inotify_rm_watch(inotifyFd, id < 0 ? -id : id);
 
     ::close(inotifyFd);
diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index 2cd650a296..40d4c1f150 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -51,7 +51,7 @@ QKqueueFileSystemWatcherEngine::~QKqueueFileSystemWatcherEngine()
     notifier.setEnabled(false);
     close(kqfd);
 
-    for (int id : qAsConst(pathToID))
+    for (int id : std::as_const(pathToID))
         ::close(id < 0 ? -id : id);
 }
 
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 4c53e4faac..7586054c27 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -317,9 +317,9 @@ QWindowsFileSystemWatcherEngine::QWindowsFileSystemWatcherEngine(QObject *parent
 
 QWindowsFileSystemWatcherEngine::~QWindowsFileSystemWatcherEngine()
 {
-    for (auto *thread : qAsConst(threads))
+    for (auto *thread : std::as_const(threads))
         thread->stop();
-    for (auto *thread : qAsConst(threads))
+    for (auto *thread : std::as_const(threads))
         thread->wait();
     qDeleteAll(threads);
 }
@@ -433,7 +433,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
 
             // now look for a thread to insert
             bool found = false;
-            for (QWindowsFileSystemWatcherEngineThread *thread : qAsConst(threads)) {
+            for (QWindowsFileSystemWatcherEngineThread *thread : std::as_const(threads)) {
                 const auto locker = qt_scoped_lock(thread->mutex);
                 if (thread->handles.count() < MAXIMUM_WAIT_OBJECTS) {
                     DEBUG() << "Added handle" << handle.handle << "for" << absolutePath << "to watch" << fileInfo.absoluteFilePath()
@@ -586,7 +586,7 @@ QWindowsFileSystemWatcherEngineThread::~QWindowsFileSystemWatcherEngineThread()
     CloseHandle(handles.at(0));
     handles[0] = INVALID_HANDLE_VALUE;
 
-    for (HANDLE h : qAsConst(handles)) {
+    for (HANDLE h : std::as_const(handles)) {
         if (h == INVALID_HANDLE_VALUE)
             continue;
         FindCloseChangeNotification(h);
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index cf5a0c66c3..a44ae1a260 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1081,16 +1081,16 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
         QStringList paths;
         if (!application.isEmpty()) {
             paths.reserve(dirs.size() * 2);
-            for (const auto &dir : qAsConst(dirs))
+            for (const auto &dir : std::as_const(dirs))
                 paths.append(dir + u'/' + appFile);
         } else {
             paths.reserve(dirs.size());
         }
-        for (const auto &dir : qAsConst(dirs))
+        for (const auto &dir : std::as_const(dirs))
             paths.append(dir + u'/' + orgFile);
 
         // Note: No check for existence of files is done intentionally.
-        for (const auto &path : qAsConst(paths))
+        for (const auto &path : std::as_const(paths))
             confFiles.append(QConfFile::fromName(path, false));
     } else
 #endif // Q_XDG_PLATFORM && !QT_NO_STANDARDPATHS
@@ -1123,7 +1123,7 @@ QConfFileSettingsPrivate::~QConfFileSettingsPrivate()
     ConfFileHash *usedHash = usedHashFunc();
     ConfFileCache *unusedCache = unusedCacheFunc();
 
-    for (auto conf_file : qAsConst(confFiles)) {
+    for (auto conf_file : std::as_const(confFiles)) {
         if (!conf_file->ref.deref()) {
             if (conf_file->size == 0) {
                 delete conf_file;
@@ -1197,7 +1197,7 @@ std::optional<QVariant> QConfFileSettingsPrivate::get(const QString &key) const
     ParsedSettingsMap::const_iterator j;
     bool found = false;
 
-    for (auto confFile : qAsConst(confFiles)) {
+    for (auto confFile : std::as_const(confFiles)) {
         const auto locker = qt_scoped_lock(confFile->mutex);
 
         if (!confFile->addedKeys.isEmpty()) {
@@ -1226,7 +1226,7 @@ QStringList QConfFileSettingsPrivate::children(const QString &prefix, ChildSpec
     QSettingsKey thePrefix(prefix, caseSensitivity);
     qsizetype startPos = prefix.size();
 
-    for (auto confFile : qAsConst(confFiles)) {
+    for (auto confFile : std::as_const(confFiles)) {
         const auto locker = qt_scoped_lock(confFile->mutex);
 
         if (thePrefix.isEmpty())
@@ -1277,7 +1277,7 @@ void QConfFileSettingsPrivate::sync()
     // people probably won't be checking the status a whole lot, so in case of
     // error we just try to go on and make the best of it
 
-    for (auto confFile : qAsConst(confFiles)) {
+    for (auto confFile : std::as_const(confFiles)) {
         const auto locker = qt_scoped_lock(confFile->mutex);
         syncConfFile(confFile);
     }
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index e6991dd7b6..bda8b47d4a 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -713,7 +713,7 @@ QAbstractItemModel *QAbstractItemModelPrivate::staticEmptyModel()
 
 void QAbstractItemModelPrivate::invalidatePersistentIndexes()
 {
-    for (QPersistentModelIndexData *data : qAsConst(persistent.indexes))
+    for (QPersistentModelIndexData *data : std::as_const(persistent.indexes))
         data->index = QModelIndex();
     persistent.indexes.clear();
 }
@@ -861,7 +861,7 @@ void QAbstractItemModelPrivate::rowsAboutToBeInserted(const QModelIndex &parent,
     Q_UNUSED(last);
     QList<QPersistentModelIndexData *> persistent_moved;
     if (first < q->rowCount(parent)) {
-        for (auto *data : qAsConst(persistent.indexes)) {
+        for (auto *data : std::as_const(persistent.indexes)) {
             const QModelIndex &index = data->index;
             if (index.row() >= first && index.isValid() && index.parent() == parent) {
                 persistent_moved.append(data);
@@ -897,7 +897,7 @@ void QAbstractItemModelPrivate::itemsAboutToBeMoved(const QModelIndex &srcParent
     const bool sameParent = (srcParent == destinationParent);
     const bool movingUp = (srcFirst > destinationChild);
 
-    for (auto *data : qAsConst(persistent.indexes)) {
+    for (auto *data : std::as_const(persistent.indexes)) {
         const QModelIndex &index = data->index;
         const QModelIndex &parent = index.parent();
         const bool isSourceIndex = (parent == srcParent);
@@ -995,7 +995,7 @@ void QAbstractItemModelPrivate::rowsAboutToBeRemoved(const QModelIndex &parent,
     QList<QPersistentModelIndexData *> persistent_invalidated;
     // find the persistent indexes that are affected by the change, either by being in the removed subtree
     // or by being on the same level and below the removed rows
-    for (auto *data : qAsConst(persistent.indexes)) {
+    for (auto *data : std::as_const(persistent.indexes)) {
         bool level_changed = false;
         QModelIndex current = data->index;
         while (current.isValid()) {
@@ -1047,7 +1047,7 @@ void QAbstractItemModelPrivate::columnsAboutToBeInserted(const QModelIndex &pare
     Q_UNUSED(last);
     QList<QPersistentModelIndexData *> persistent_moved;
     if (first < q->columnCount(parent)) {
-        for (auto *data : qAsConst(persistent.indexes)) {
+        for (auto *data : std::as_const(persistent.indexes)) {
             const QModelIndex &index = data->index;
             if (index.column() >= first && index.isValid() && index.parent() == parent)
                 persistent_moved.append(data);
@@ -1080,7 +1080,7 @@ void QAbstractItemModelPrivate::columnsAboutToBeRemoved(const QModelIndex &paren
     QList<QPersistentModelIndexData *> persistent_invalidated;
     // find the persistent indexes that are affected by the change, either by being in the removed subtree
     // or by being on the same level and to the right of the removed columns
-    for (auto *data : qAsConst(persistent.indexes)) {
+    for (auto *data : std::as_const(persistent.indexes)) {
         bool level_changed = false;
         QModelIndex current = data->index;
         while (current.isValid()) {
@@ -3460,7 +3460,7 @@ void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from,
         }
     }
 
-    for (auto *data : qAsConst(toBeReinserted))
+    for (auto *data : std::as_const(toBeReinserted))
         d->persistent.insertMultiAtEnd(data->index, data);
 }
 
@@ -3474,7 +3474,7 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
     Q_D(const QAbstractItemModel);
     QModelIndexList result;
     result.reserve(d->persistent.indexes.size());
-    for (auto *data : qAsConst(d->persistent.indexes))
+    for (auto *data : std::as_const(d->persistent.indexes))
         result.append(data->index);
     return result;
 }
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index fb134f7878..ec98e3a1f7 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1616,7 +1616,7 @@ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &par
 
     QItemSelection sel = d->ranges;
     sel.merge(d->currentSelection, d->currentCommand);
-    for (const QItemSelectionRange &range : qAsConst(sel)) {
+    for (const QItemSelectionRange &range : std::as_const(sel)) {
         if (range.parent() != parent)
             return false;
         int top = range.top();
@@ -1651,7 +1651,7 @@ bool QItemSelectionModel::columnIntersectsSelection(int column, const QModelInde
 
     QItemSelection sel = d->ranges;
     sel.merge(d->currentSelection, d->currentCommand);
-    for (const QItemSelectionRange &range : qAsConst(sel)) {
+    for (const QItemSelectionRange &range : std::as_const(sel)) {
         if (range.parent() != parent)
             return false;
         int top = range.top();
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 251b632e67..fa88ff0a96 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -450,7 +450,7 @@ bool QSortFilterProxyModelPrivate::recursiveChildAcceptsRow(int source_row, cons
 void QSortFilterProxyModelPrivate::remove_from_mapping(const QModelIndex &source_parent)
 {
     if (Mapping *m = source_index_mapping.take(source_parent)) {
-        for (const QModelIndex &mappedIdx : qAsConst(m->mapped_children))
+        for (const QModelIndex &mappedIdx : std::as_const(m->mapped_children))
             remove_from_mapping(mappedIdx);
         delete m;
     }
@@ -1175,7 +1175,7 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour
     }
 
     // reinsert moved, mapped indexes
-    for (auto &pair : qAsConst(moved_source_index_mappings)) {
+    for (auto &pair : std::as_const(moved_source_index_mappings)) {
         pair.second->source_parent = pair.first;
         source_index_mapping.insert(pair.first, pair.second);
     }
@@ -1224,7 +1224,7 @@ QModelIndexPairList QSortFilterProxyModelPrivate::store_persistent_indexes() con
     Q_Q(const QSortFilterProxyModel);
     QModelIndexPairList source_indexes;
     source_indexes.reserve(persistent.indexes.size());
-    for (const QPersistentModelIndexData *data : qAsConst(persistent.indexes)) {
+    for (const QPersistentModelIndexData *data : std::as_const(persistent.indexes)) {
         const QModelIndex &proxy_index = data->index;
         QModelIndex source_index = q->mapToSource(proxy_index);
         source_indexes.append(qMakePair(proxy_index, QPersistentModelIndex(source_index)));
diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp
index 96343674b8..621b54782e 100644
--- a/src/corelib/itemmodels/qtransposeproxymodel.cpp
+++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp
@@ -32,7 +32,7 @@ void QTransposeProxyModelPrivate::onLayoutChanged(const QList<QPersistentModelIn
     Q_ASSERT(layoutChangeProxyIndexes.size() == layoutChangePersistentIndexes.size());
     QModelIndexList toList;
     toList.reserve(layoutChangePersistentIndexes.size());
-    for (const QPersistentModelIndex &persistIdx : qAsConst(layoutChangePersistentIndexes))
+    for (const QPersistentModelIndex &persistIdx : std::as_const(layoutChangePersistentIndexes))
         toList << q->mapFromSource(persistIdx);
     q->changePersistentIndexList(layoutChangeProxyIndexes, toList);
     layoutChangeProxyIndexes.clear();
@@ -172,7 +172,7 @@ void QTransposeProxyModel::setSourceModel(QAbstractItemModel* newSourceModel)
         return;
     beginResetModel();
     if (d->model) {
-        for (const QMetaObject::Connection& discIter : qAsConst(d->sourceConnections))
+        for (const QMetaObject::Connection& discIter : std::as_const(d->sourceConnections))
             disconnect(discIter);
     }
     d->sourceConnections.clear();
diff --git a/src/corelib/kernel/qcfsocketnotifier.cpp b/src/corelib/kernel/qcfsocketnotifier.cpp
index 99f66170f3..21a22a7439 100644
--- a/src/corelib/kernel/qcfsocketnotifier.cpp
+++ b/src/corelib/kernel/qcfsocketnotifier.cpp
@@ -213,7 +213,7 @@ void QCFSocketNotifier::unregisterSocketNotifier(QSocketNotifier *notifier)
 void QCFSocketNotifier::removeSocketNotifiers()
 {
     // Remove CFSockets from the runloop.
-    for (MacSocketInfo *socketInfo : qAsConst(macSockets)) {
+    for (MacSocketInfo *socketInfo : std::as_const(macSockets)) {
         unregisterSocketInfo(socketInfo);
         delete socketInfo;
     }
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 798ac8fdd7..fda283b9ef 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -302,7 +302,7 @@ void Q_CORE_EXPORT qt_call_post_routines()
 
         if (list.isEmpty())
             break;
-        for (QtCleanUpFunction f : qAsConst(list))
+        for (QtCleanUpFunction f : std::as_const(list))
             f();
     }
 }
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index af0b0d03d2..9333a1ffe3 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -216,7 +216,7 @@ int QEventDispatcherUNIXPrivate::activateTimers()
 
 void QEventDispatcherUNIXPrivate::markPendingSocketNotifiers()
 {
-    for (const pollfd &pfd : qAsConst(pollfds)) {
+    for (const pollfd &pfd : std::as_const(pollfds)) {
         if (pfd.fd < 0 || pfd.revents == 0)
             continue;
 
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 04e1abf16a..1c54c97514 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -764,7 +764,7 @@ QEventDispatcherWin32::registeredTimers(QObject *object) const
 
     Q_D(const QEventDispatcherWin32);
     QList<TimerInfo> list;
-    for (WinTimerInfo *t : qAsConst(d->timerDict)) {
+    for (WinTimerInfo *t : std::as_const(d->timerDict)) {
         Q_ASSERT(t);
         if (t->obj == object)
             list << TimerInfo(t->timerId, t->interval, t->timerType);
@@ -832,7 +832,7 @@ void QEventDispatcherWin32::closingDown()
     Q_ASSERT(d->active_fd.isEmpty());
 
     // clean up any timers
-    for (WinTimerInfo *t : qAsConst(d->timerDict))
+    for (WinTimerInfo *t : std::as_const(d->timerDict))
         d->unregisterTimer(t);
     d->timerDict.clear();
 
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index 197e37357f..5981a08552 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -53,7 +53,7 @@ static jboolean dispatchGenericMotionEvent(JNIEnv *, jclass, jobject event)
 {
     jboolean ret = JNI_FALSE;
     QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-    for (auto *listener : qAsConst(g_genericMotionEventListeners()->listeners))
+    for (auto *listener : std::as_const(g_genericMotionEventListeners()->listeners))
         ret |= listener->handleGenericMotionEvent(event);
     return ret;
 }
@@ -70,7 +70,7 @@ static jboolean dispatchKeyEvent(JNIEnv *, jclass, jobject event)
 {
     jboolean ret = JNI_FALSE;
     QMutexLocker locker(&g_keyEventListeners()->mutex);
-    for (auto *listener : qAsConst(g_keyEventListeners()->listeners))
+    for (auto *listener : std::as_const(g_keyEventListeners()->listeners))
         ret |= listener->handleKeyEvent(event);
     return ret;
 }
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
index eb17389031..4c9eeb4468 100644
--- a/src/corelib/kernel/qtimerinfo_unix.cpp
+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
@@ -390,7 +390,7 @@ qint64 QTimerInfoList::timerRemainingTime(int timerId)
     repairTimersIfNeeded();
     timespec tm = {0, 0};
 
-    for (const auto *t : qAsConst(*this)) {
+    for (const auto *t : std::as_const(*this)) {
         if (t->id == timerId) {
             if (currentTime < t->timeout) {
                 // time to wait
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 85e69ea2a1..521503b96b 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -635,7 +635,7 @@ static QString find_translation(const QLocale & locale,
             languages.insert(i + 1, lowerLang);
     }
 
-    for (QString localeName : qAsConst(languages)) {
+    for (QString localeName : std::as_const(languages)) {
         localeName.replace(u'-', u'_');
 
         // try the complete locale name first and progressively truncate from
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index 6d6b322229..fbd16102fc 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -386,7 +386,7 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileNa
                 if (candidatesByName.m_matchingMimeTypes.contains(sniffedMime)) {
                     return candidateByData;
                 }
-                for (const QString &m : qAsConst(candidatesByName.m_allMatchingMimeTypes)) {
+                for (const QString &m : std::as_const(candidatesByName.m_allMatchingMimeTypes)) {
                     if (inherits(m, sniffedMime)) {
                         // We have magic + pattern pointing to this, so it's a pretty good match
                         return mimeTypeForName(m);
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp
index 2642e5dad5..c1533dd459 100644
--- a/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/src/corelib/mimetypes/qmimeprovider.cpp
@@ -449,10 +449,10 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result)
     loadMimeTypeList();
     if (result.isEmpty()) {
         result.reserve(m_mimetypeNames.size());
-        for (const QString &name : qAsConst(m_mimetypeNames))
+        for (const QString &name : std::as_const(m_mimetypeNames))
             result.append(mimeTypeForNameUnchecked(name));
     } else {
-        for (const QString &name : qAsConst(m_mimetypeNames))
+        for (const QString &name : std::as_const(m_mimetypeNames))
             if (std::find_if(result.constBegin(), result.constEnd(), [name](const QMimeType &mime) -> bool { return mime.name() == name; })
                     == result.constEnd())
                 result.append(mimeTypeForNameUnchecked(name));
@@ -680,7 +680,7 @@ void QMimeXMLProvider::findByMagic(const QByteArray &data, int *accuracyPtr, QMi
 {
     QString candidateName;
     bool foundOne = false;
-    for (const QMimeMagicRuleMatcher &matcher : qAsConst(m_magicMatchers)) {
+    for (const QMimeMagicRuleMatcher &matcher : std::as_const(m_magicMatchers)) {
         if (matcher.matches(data)) {
             const int priority = matcher.priority();
             if (priority > *accuracyPtr) {
@@ -716,7 +716,7 @@ void QMimeXMLProvider::ensureLoaded()
 
     //qDebug() << "Loading" << m_allFiles;
 
-    for (const QString &file : qAsConst(allFiles))
+    for (const QString &file : std::as_const(allFiles))
         load(file);
 }
 
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp
index 16b6d460eb..24780ffe27 100644
--- a/src/corelib/mimetypes/qmimetype.cpp
+++ b/src/corelib/mimetypes/qmimetype.cpp
@@ -225,7 +225,7 @@ QString QMimeType::comment() const
     languageList << QLocale().name();
     languageList << QLocale().uiLanguages();
     languageList << u"default"_s; // use the default locale if possible.
-    for (const QString &language : qAsConst(languageList)) {
+    for (const QString &language : std::as_const(languageList)) {
         const QString lang = language == "C"_L1 ? u"en_US"_s : language;
         const QString comm = d->localeComments.value(lang);
         if (!comm.isEmpty())
@@ -410,7 +410,7 @@ QStringList QMimeType::suffixes() const
     QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d));
 
     QStringList result;
-    for (const QString &pattern : qAsConst(d->globPatterns)) {
+    for (const QString &pattern : std::as_const(d->globPatterns)) {
         // Not a simple suffix if it looks like: README or *. or *.* or *.JP*G or *.JP?
         if (pattern.startsWith("*."_L1) &&
             pattern.size() > 2 &&
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 06015127d6..a9d6247697 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -132,7 +132,7 @@ Q_GLOBAL_STATIC(QFactoryLoaderGlobals, qt_factoryloader_global)
 
 QFactoryLoaderPrivate::~QFactoryLoaderPrivate()
 {
-    for (QLibraryPrivate *library : qAsConst(libraryList))
+    for (QLibraryPrivate *library : std::as_const(libraryList))
         library->release();
 }
 
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 79725e258e..dc00763fd5 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -357,7 +357,7 @@ inline void QLibraryStore::cleanup()
 
     // dump all objects that remain
     if (lcDebugLibrary().isDebugEnabled()) {
-        for (QLibraryPrivate *lib : qAsConst(data->libraryMap)) {
+        for (QLibraryPrivate *lib : std::as_const(data->libraryMap)) {
             if (lib)
                 qDebug(lcDebugLibrary)
                         << "On QtCore unload," << lib->fileName << "was leaked, with"
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index 7ad6e9e335..898d5a2f6c 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -164,7 +164,7 @@ bool QLibraryPrivate::load_sys()
             QStringList tmp;
             qSwap(tmp, list);
             list.reserve(tmp.size() * 2);
-            for (const QString &s : qAsConst(tmp)) {
+            for (const QString &s : std::as_const(tmp)) {
                 QString modifiedPath = s;
                 f(&modifiedPath);
                 list.append(modifiedPath);
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
index 741dd8cff9..c95118e554 100644
--- a/src/corelib/plugin/qlibrary_win.cpp
+++ b/src/corelib/plugin/qlibrary_win.cpp
@@ -59,7 +59,7 @@ bool QLibraryPrivate::load_sys()
 
     locker.unlock();
     Handle hnd = nullptr;
-    for (const QString &attempt : qAsConst(attempts)) {
+    for (const QString &attempt : std::as_const(attempts)) {
         hnd = LoadLibrary(reinterpret_cast<const wchar_t*>(QDir::toNativeSeparators(attempt).utf16()));
 
         // If we have a handle or the last error is something other than "unable
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index e86d4ccec8..599256783e 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -246,9 +246,9 @@ static QString locatePlugin(const QString& fileName)
         paths = QCoreApplication::libraryPaths();
     }
 
-    for (const QString &path : qAsConst(paths)) {
-        for (const QString &prefix : qAsConst(prefixes)) {
-            for (const QString &suffix : qAsConst(suffixes)) {
+    for (const QString &path : std::as_const(paths)) {
+        for (const QString &prefix : std::as_const(prefixes)) {
+            for (const QString &suffix : std::as_const(suffixes)) {
 #ifdef Q_OS_ANDROID
                 {
                     QString pluginPath = basePath + prefix + baseName + suffix;
diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp
index a45158bcb0..5f6c0feb49 100644
--- a/src/corelib/serialization/qcborstreamreader.cpp
+++ b/src/corelib/serialization/qcborstreamreader.cpp
@@ -970,7 +970,7 @@ QCborStreamReader::Type QCborStreamReader::parentContainerType() const
 {
     if (d->containerStack.isEmpty())
         return Invalid;
-    return Type(cbor_value_get_type(&qAsConst(d->containerStack).top()));
+    return Type(cbor_value_get_type(&std::as_const(d->containerStack).top()));
 }
 
 /*!
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp
index 1df4a16e97..1cb351906c 100644
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@@ -944,7 +944,7 @@ QCborContainerPrivate *QCborContainerPrivate::clone(QCborContainerPrivate *d, qs
         d = u.take();
         d->ref.storeRelaxed(0);
 
-        for (auto &e : qAsConst(d->elements)) {
+        for (auto &e : std::as_const(d->elements)) {
             if (e.flags & Element::IsContainer)
                 e.container->ref.ref();
         }
diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h
index b95d25d6fd..3b3d122fee 100644
--- a/src/corelib/serialization/qcborvalue.h
+++ b/src/corelib/serialization/qcborvalue.h
@@ -545,13 +545,13 @@ public:
 #if QT_CONFIG(cborstreamwriter)
     using QCborValueConstRef::toCbor;
     QByteArray toCbor(QCborValue::EncodingOptions opt = QCborValue::NoTransformation)
-    { return qAsConst(*this).toCbor(opt); }
+    { return std::as_const(*this).toCbor(opt); }
     void toCbor(QCborStreamWriter &writer, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
 #endif
 
     using QCborValueConstRef::toDiagnosticNotation;
     QString toDiagnosticNotation(QCborValue::DiagnosticNotationOptions opt = QCborValue::Compact)
-    { return qAsConst(*this).toDiagnosticNotation(opt); }
+    { return std::as_const(*this).toDiagnosticNotation(opt); }
 
 private:
     static QCborValue concrete(QCborValueRef that) noexcept;
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 12053054ba..e77ff3f3d0 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -4463,7 +4463,7 @@ QString &QString::replace(const QRegularExpression &re, const QString &after)
 
         lastEnd = 0;
         // add the after string, with replacements for the backreferences
-        for (const QStringCapture &backReference : qAsConst(backReferences)) {
+        for (const QStringCapture &backReference : std::as_const(backReferences)) {
             // part of "after" before the backreference
             len = backReference.pos - lastEnd;
             if (len > 0) {
@@ -4501,7 +4501,7 @@ QString &QString::replace(const QRegularExpression &re, const QString &after)
     resize(newLength);
     qsizetype i = 0;
     QChar *uc = data();
-    for (const QStringView &chunk : qAsConst(chunks)) {
+    for (const QStringView &chunk : std::as_const(chunks)) {
         qsizetype len = chunk.length();
         memcpy(uc + i, chunk.constData(), len * sizeof(QChar));
         i += len;
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index f633ed7801..6d4259e279 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -71,7 +71,7 @@ public:
     template <typename T>
     T *pointer()
     {
-        const T *p = qAsConst(*this).pointer<T>();
+        const T *p = std::as_const(*this).pointer<T>();
         return const_cast<T *>(p);
     }
 
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
index 1c3b79033a..a8a58fd12a 100644
--- a/src/corelib/thread/qthreadpool.cpp
+++ b/src/corelib/thread/qthreadpool.cpp
@@ -188,7 +188,7 @@ inline bool comparePriority(int priority, const QueuePage *p)
 void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority)
 {
     Q_ASSERT(runnable != nullptr);
-    for (QueuePage *page : qAsConst(queue)) {
+    for (QueuePage *page : std::as_const(queue)) {
         if (page->priority() == priority && !page->isFull()) {
             page->push(runnable);
             return;
@@ -269,7 +269,7 @@ void QThreadPoolPrivate::reset()
 
     mutex.unlock();
 
-    for (QThreadPoolThread *thread : qAsConst(allThreadsCopy)) {
+    for (QThreadPoolThread *thread : std::as_const(allThreadsCopy)) {
         if (thread->isRunning()) {
             thread->runnableReady.wakeAll();
             thread->wait();
@@ -348,7 +348,7 @@ bool QThreadPool::tryTake(QRunnable *runnable)
         return false;
 
     QMutexLocker locker(&d->mutex);
-    for (QueuePage *page : qAsConst(d->queue)) {
+    for (QueuePage *page : std::as_const(d->queue)) {
         if (page->tryTake(runnable)) {
             if (page->isFinished()) {
                 d->queue.removeOne(page);
diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp
index 0deef043cd..2152ae551f 100644
--- a/src/corelib/thread/qwaitcondition_win.cpp
+++ b/src/corelib/thread/qwaitcondition_win.cpp
@@ -178,7 +178,7 @@ void QWaitCondition::wakeOne()
 {
     // wake up the first waiting thread in the queue
     QMutexLocker locker(&d->mtx);
-    for (QWaitConditionEvent *current : qAsConst(d->queue)) {
+    for (QWaitConditionEvent *current : std::as_const(d->queue)) {
         if (current->wokenUp)
             continue;
         SetEvent(current->event);
@@ -191,7 +191,7 @@ void QWaitCondition::wakeAll()
 {
     // wake up the all threads in the queue
     QMutexLocker locker(&d->mtx);
-    for (QWaitConditionEvent *current : qAsConst(d->queue)) {
+    for (QWaitConditionEvent *current : std::as_const(d->queue)) {
         SetEvent(current->event);
         current->wokenUp = true;
     }
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index 1ee1360fa1..099bccb071 100644
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -826,7 +826,7 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
     // Offsets are stored as total offset, want to know separate UTC and DST offsets
     // so find the first non-dst transition to use as base UTC Offset
     int utcOffset = ret.m_preZoneRule.stdOffset;
-    for (const QTzTransition &tran : qAsConst(tranList)) {
+    for (const QTzTransition &tran : std::as_const(tranList)) {
         if (!typeList.at(tran.tz_typeind).tz_isdst) {
             utcOffset = typeList.at(tran.tz_typeind).tz_gmtoff;
             break;
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index 9f890fa8be..03074f4f32 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -793,7 +793,7 @@ bool QCommandLineParser::isSet(const QString &name) const
     if (d->optionNames.contains(name))
         return true;
     const QStringList aliases = d->aliases(name);
-    for (const QString &optionName : qAsConst(d->optionNames)) {
+    for (const QString &optionName : std::as_const(d->optionNames)) {
         if (aliases.contains(optionName))
             return true;
     }
@@ -1110,7 +1110,7 @@ QString QCommandLineParserPrivate::helpText(bool includeQtOptions) const
     QStringList optionNameList;
     optionNameList.reserve(options.size());
     int longestOptionNameString = 0;
-    for (const QCommandLineOption &option : qAsConst(options)) {
+    for (const QCommandLineOption &option : std::as_const(options)) {
         if (option.flags() & QCommandLineOption::HiddenFromHelp)
             continue;
         const QStringList optionNames = option.names();
@@ -1130,7 +1130,7 @@ QString QCommandLineParserPrivate::helpText(bool includeQtOptions) const
     ++longestOptionNameString;
     const int optionNameMaxWidth = qMin(50, longestOptionNameString);
     auto optionNameIterator = optionNameList.cbegin();
-    for (const QCommandLineOption &option : qAsConst(options)) {
+    for (const QCommandLineOption &option : std::as_const(options)) {
         if (option.flags() & QCommandLineOption::HiddenFromHelp)
             continue;
         text += wrapText(*optionNameIterator, optionNameMaxWidth, option.description());
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index 9f06b5d36e..9b27415244 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -2121,7 +2121,7 @@ public:
     {
         const auto copy = isDetached() ? QMultiHash() : *this; // keep 'key' alive across the detach
         detach();
-        auto pair = qAsConst(*this).equal_range(key);
+        auto pair = std::as_const(*this).equal_range(key);
         return qMakePair(iterator(pair.first.i), iterator(pair.second.i));
     }
 
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index 2a945a31e8..2981bffa35 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -244,7 +244,7 @@ Q_INLINE_TEMPLATE QSet<T> &QSet<T>::intersect(const QSet<T> &other)
         copy2 = *this;
         *this = copy1;
     }
-    for (const auto &e : qAsConst(copy1)) {
+    for (const auto &e : std::as_const(copy1)) {
         if (!copy2.contains(e))
             remove(e);
     }
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 107a825b98..2cb6e97f22 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -415,9 +415,9 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     qsizetype data_size = idata.size() +
                     (header->methodCount * (QMetaObjectPrivate::IntsPerMethod+intsPerMethod)) + methodParametersDataSize +
                     (header->propertyCount * (QMetaObjectPrivate::IntsPerProperty+intsPerProperty));
-    for (const Method &mm : qAsConst(signals_))
+    for (const Method &mm : std::as_const(signals_))
         data_size += 2 + mm.inputTypes.size() + mm.outputTypes.size();
-    for (const Method &mm : qAsConst(methods))
+    for (const Method &mm : std::as_const(methods))
         data_size += 2 + mm.inputTypes.size() + mm.outputTypes.size();
     idata.resize(data_size + 1);
 
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index ebff0b559c..21d422ac9e 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -81,7 +81,7 @@ QDBusServer::~QDBusServer()
     QMutexLocker locker(managerMutex);
     QWriteLocker writeLocker(&d->lock);
     if (QDBusConnectionManager::instance()) {
-        for (const QString &name : qAsConst(d->serverConnectionNames))
+        for (const QString &name : std::as_const(d->serverConnectionNames))
             QDBusConnectionManager::instance()->removeConnection(name);
         d->serverConnectionNames.clear();
         locker.unlock();
diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp
index 835a7cd3ac..4d180e2124 100644
--- a/src/dbus/qdbusservicewatcher.cpp
+++ b/src/dbus/qdbusservicewatcher.cpp
@@ -62,7 +62,7 @@ void QDBusServiceWatcherPrivate::setConnection(const QStringList &services,
 {
     if (connection.isConnected()) {
         // remove older rules
-        for (const QString &s : qAsConst(watchedServicesData.value()))
+        for (const QString &s : std::as_const(watchedServicesData.value()))
             removeService(s);
     }
 
@@ -72,7 +72,7 @@ void QDBusServiceWatcherPrivate::setConnection(const QStringList &services,
 
     if (connection.isConnected()) {
         // add new rules
-        for (const QString &s : qAsConst(watchedServicesData.value()))
+        for (const QString &s : std::as_const(watchedServicesData.value()))
             addService(s);
     }
 }
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 8f66498d6e..bf33f45a7c 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -451,7 +451,7 @@ void QPixmapIconEngine::addFile(const QString &fileName, const QSize &size, QIco
             }
         }
     }
-    for (const QImage &i : qAsConst(icoImages))
+    for (const QImage &i : std::as_const(icoImages))
         pixmaps += QPixmapIconEngineEntry(abs, i, mode, state);
     if (icoImages.isEmpty() && !ignoreSize) // Add placeholder with the filename and empty pixmap for the size.
         pixmaps += QPixmapIconEngineEntry(abs, size, mode, state);
diff --git a/src/gui/itemmodels/qfileinfogatherer.cpp b/src/gui/itemmodels/qfileinfogatherer.cpp
index fdba75d736..662c7188aa 100644
--- a/src/gui/itemmodels/qfileinfogatherer.cpp
+++ b/src/gui/itemmodels/qfileinfogatherer.cpp
@@ -282,9 +282,9 @@ void QFileInfoGatherer::run()
             condition.wait(&mutex);
         if (abort.loadRelaxed())
             return;
-        const QString thisPath = qAsConst(path).front();
+        const QString thisPath = std::as_const(path).front();
         path.pop_front();
-        const QStringList thisList = qAsConst(files).front();
+        const QStringList thisList = std::as_const(files).front();
         files.pop_front();
         locker.unlock();
 
diff --git a/src/gui/itemmodels/qfilesystemmodel.cpp b/src/gui/itemmodels/qfilesystemmodel.cpp
index 4cb393c5a1..44278f86be 100644
--- a/src/gui/itemmodels/qfilesystemmodel.cpp
+++ b/src/gui/itemmodels/qfilesystemmodel.cpp
@@ -1944,7 +1944,7 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path,
     std::sort(rowsToUpdate.begin(), rowsToUpdate.end());
     QString min;
     QString max;
-    for (const QString &value : qAsConst(rowsToUpdate)) {
+    for (const QString &value : std::as_const(rowsToUpdate)) {
         //##TODO is there a way to bundle signals with QString as the content of the list?
         /*if (min.isEmpty()) {
             min = value;
diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h
index 62a23205e4..95d1ac9438 100644
--- a/src/gui/itemmodels/qfilesystemmodel_p.h
+++ b/src/gui/itemmodels/qfilesystemmodel_p.h
@@ -146,7 +146,7 @@ public:
         void updateIcon(QAbstractFileIconProvider *iconProvider, const QString &path) {
             if (info)
                 info->icon = iconProvider->icon(QFileInfo(path));
-            for (QFileSystemNode *child : qAsConst(children)) {
+            for (QFileSystemNode *child : std::as_const(children)) {
                 //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
                 if (!path.isEmpty()) {
                     if (path.endsWith(u'/'))
@@ -161,7 +161,7 @@ public:
         void retranslateStrings(QAbstractFileIconProvider *iconProvider, const QString &path) {
             if (info)
                 info->displayType = iconProvider->type(QFileInfo(path));
-            for (QFileSystemNode *child : qAsConst(children)) {
+            for (QFileSystemNode *child : std::as_const(children)) {
                 //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
                 if (!path.isEmpty()) {
                     if (path.endsWith(u'/'))
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index febabda6dd..8a21190e49 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -840,7 +840,7 @@ QStandardItem &QStandardItem::operator=(const QStandardItem &other)
 QStandardItem::~QStandardItem()
 {
     Q_D(QStandardItem);
-    for (QStandardItem *child : qAsConst(d->children)) {
+    for (QStandardItem *child : std::as_const(d->children)) {
         if (child)
             child->d_func()->setModel(nullptr);
         delete child;
@@ -3144,7 +3144,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
     }
 
     stack.reserve(itemsSet.size());
-    for (QStandardItem *item : qAsConst(itemsSet))
+    for (QStandardItem *item : std::as_const(itemsSet))
         stack.push(item);
 
     //stream everything recursively
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index 9dbe42519d..96ed267f82 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -81,26 +81,26 @@ void QActionPrivate::sendDataChanged()
 void QActionPrivate::redoGrab(QShortcutMap &map)
 {
     Q_Q(QAction);
-    for (int id : qAsConst(shortcutIds)) {
+    for (int id : std::as_const(shortcutIds)) {
         if (id)
             map.removeShortcut(id, q);
     }
 
     shortcutIds.clear();
-    for (const QKeySequence &shortcut : qAsConst(shortcuts)) {
+    for (const QKeySequence &shortcut : std::as_const(shortcuts)) {
         if (!shortcut.isEmpty())
             shortcutIds.append(map.addShortcut(q, shortcut, shortcutContext, contextMatcher()));
         else
             shortcutIds.append(0);
     }
     if (!enabled) {
-        for (int id : qAsConst(shortcutIds)) {
+        for (int id : std::as_const(shortcutIds)) {
             if (id)
                 map.setShortcutEnabled(false, id, q);
         }
     }
     if (!autorepeat) {
-        for (int id : qAsConst(shortcutIds)) {
+        for (int id : std::as_const(shortcutIds)) {
             if (id)
                 map.setShortcutAutoRepeat(false, id, q);
         }
@@ -110,7 +110,7 @@ void QActionPrivate::redoGrab(QShortcutMap &map)
 void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
 {
     Q_Q(QAction);
-    for (int id : qAsConst(shortcutIds)) {
+    for (int id : std::as_const(shortcutIds)) {
         if (id)
             map.setShortcutEnabled(enable, id, q);
     }
@@ -458,7 +458,7 @@ QAction::~QAction()
         d->group->removeAction(this);
 #if QT_CONFIG(shortcut)
     if (qApp) {
-        for (int id : qAsConst(d->shortcutIds)) {
+        for (int id : std::as_const(d->shortcutIds)) {
             if (id)
                 QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this);
         }
@@ -1024,7 +1024,7 @@ bool QAction::event(QEvent *e)
 {
     Q_D(QAction);
     if (e->type() == QEvent::ActionChanged) {
-        for (auto object : qAsConst(d->associatedObjects))
+        for (auto object : std::as_const(d->associatedObjects))
             QCoreApplication::sendEvent(object, e);
     }
 
diff --git a/src/gui/kernel/qactiongroup.cpp b/src/gui/kernel/qactiongroup.cpp
index 69fc87a27f..7fb5b4ad46 100644
--- a/src/gui/kernel/qactiongroup.cpp
+++ b/src/gui/kernel/qactiongroup.cpp
@@ -277,7 +277,7 @@ void QActionGroup::setEnabled(bool b)
 {
     Q_D(QActionGroup);
     d->enabled = b;
-    for (auto action : qAsConst(d->actions)) {
+    for (auto action : std::as_const(d->actions)) {
         action->d_func()->setEnabled(b, true);
     }
 }
@@ -311,7 +311,7 @@ void QActionGroup::setVisible(bool b)
 {
     Q_D(QActionGroup);
     d->visible = b;
-    for (auto action : qAsConst(d->actions)) {
+    for (auto action : std::as_const(d->actions)) {
         if (!action->d_func()->forceInvisible)
             action->d_func()->setVisible(b);
     }
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index ec5a9d3710..44533bef4e 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -837,7 +837,7 @@ void QGuiApplicationPrivate::showModalWindow(QWindow *modal)
         }
     }
 
-    for (QWindow *window : qAsConst(QGuiApplicationPrivate::window_list)) {
+    for (QWindow *window : std::as_const(QGuiApplicationPrivate::window_list)) {
         if (needsWindowBlockedEvent(window) && !window->d_func()->blockedByModalWindow)
             updateBlockedStatus(window);
     }
@@ -849,7 +849,7 @@ void QGuiApplicationPrivate::hideModalWindow(QWindow *window)
 {
     self->modalWindowList.removeAll(window);
 
-    for (QWindow *window : qAsConst(QGuiApplicationPrivate::window_list)) {
+    for (QWindow *window : std::as_const(QGuiApplicationPrivate::window_list)) {
         if (needsWindowBlockedEvent(window) && window->d_func()->blockedByModalWindow)
             updateBlockedStatus(window);
     }
@@ -1097,7 +1097,7 @@ qreal QGuiApplication::devicePixelRatio() const
         return QGuiApplicationPrivate::m_maxDevicePixelRatio;
 
     QGuiApplicationPrivate::m_maxDevicePixelRatio = 1.0; // make sure we never return 0.
-    for (QScreen *screen : qAsConst(QGuiApplicationPrivate::screen_list))
+    for (QScreen *screen : std::as_const(QGuiApplicationPrivate::screen_list))
         QGuiApplicationPrivate::m_maxDevicePixelRatio = qMax(QGuiApplicationPrivate::m_maxDevicePixelRatio, screen->devicePixelRatio());
 
     return QGuiApplicationPrivate::m_maxDevicePixelRatio;
@@ -1245,7 +1245,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
     qCDebug(lcQpaTheme) << "Adding platform integration's theme names to list of theme names:" << platformIntegrationThemeNames;
     themeNames += platformIntegrationThemeNames;
     // 4) Look for a theme plugin.
-    for (const QString &themeName : qAsConst(themeNames)) {
+    for (const QString &themeName : std::as_const(themeNames)) {
         qCDebug(lcQpaTheme) << "Attempting to create platform theme" << themeName << "via QPlatformThemeFactory::create";
         QGuiApplicationPrivate::platform_theme = QPlatformThemeFactory::create(themeName, platformPluginPath);
         if (QGuiApplicationPrivate::platform_theme) {
@@ -1257,7 +1257,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
     // 5) If no theme plugin was found ask the platform integration to
     // create a theme
     if (!QGuiApplicationPrivate::platform_theme) {
-        for (const QString &themeName : qAsConst(themeNames)) {
+        for (const QString &themeName : std::as_const(themeNames)) {
             qCDebug(lcQpaTheme) << "Attempting to create platform theme" << themeName << "via createPlatformTheme";
             QGuiApplicationPrivate::platform_theme = QGuiApplicationPrivate::platform_integration->createPlatformTheme(themeName);
             if (QGuiApplicationPrivate::platform_theme) {
@@ -1278,7 +1278,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
     // boolean 'foo' or strings: 'foo=bar'
     if (!platformArguments.isEmpty()) {
         if (QObject *nativeInterface = QGuiApplicationPrivate::platform_integration->nativeInterface()) {
-            for (const QString &argument : qAsConst(platformArguments)) {
+            for (const QString &argument : std::as_const(platformArguments)) {
                 const int equalsPos = argument.indexOf(u'=');
                 const QByteArray name =
                     equalsPos != -1 ? argument.left(equalsPos).toUtf8() : argument.toUtf8();
diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp
index 3cd4f10ddc..c654ebb578 100644
--- a/src/gui/kernel/qshortcut.cpp
+++ b/src/gui/kernel/qshortcut.cpp
@@ -127,14 +127,14 @@ void QShortcutPrivate::redoGrab(QShortcutMap &map)
         return;
     }
 
-    for (int id : qAsConst(sc_ids))
+    for (int id : std::as_const(sc_ids))
         map.removeShortcut(id, q);
 
     sc_ids.clear();
     if (sc_sequences.isEmpty())
         return;
     sc_ids.reserve(sc_sequences.size());
-    for (const auto &keySequence : qAsConst(sc_sequences)) {
+    for (const auto &keySequence : std::as_const(sc_sequences)) {
         if (keySequence.isEmpty())
             continue;
         int id = map.addShortcut(q, keySequence, sc_context, contextMatcher());
@@ -337,7 +337,7 @@ QShortcut::~QShortcut()
 {
     Q_D(QShortcut);
     if (qApp) {
-         for (int id : qAsConst(d->sc_ids))
+         for (int id : std::as_const(d->sc_ids))
              QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this);
     }
 }
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index ffe39e5c0d..e3236a0086 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -621,7 +621,7 @@ void QShortcutMap::dispatchEvent(QKeyEvent *e)
     if (lcShortcutMap().isDebugEnabled()) {
         if (ambiguousShortcuts.size() > 1) {
             qCDebug(lcShortcutMap) << "The following shortcuts are about to be activated ambiguously:";
-            for (const QShortcutEntry *entry : qAsConst(ambiguousShortcuts))
+            for (const QShortcutEntry *entry : std::as_const(ambiguousShortcuts))
                 qCDebug(lcShortcutMap).nospace() << "- " << entry->keyseq << " (belonging to " << entry->owner << ")";
         }
 
diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
index 71cf3f0439..ceec540784 100644
--- a/src/gui/kernel/qsimpledrag.cpp
+++ b/src/gui/kernel/qsimpledrag.cpp
@@ -309,7 +309,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point)
 #ifndef QT_NO_HIGHDPISCALING
     QPoint res = point;
     if (QHighDpiScaling::isActive()) {
-        for (const QScreen *s : qAsConst(QGuiApplicationPrivate::screen_list)) {
+        for (const QScreen *s : std::as_const(QGuiApplicationPrivate::screen_list)) {
             if (s->handle()->geometry().contains(point)) {
                 res = QHighDpi::fromNativePixels(point, s);
                 break;
diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm
index ed44efc5ec..b03ebe55e6 100644
--- a/src/gui/painting/qcoregraphics.mm
+++ b/src/gui/painting/qcoregraphics.mm
@@ -132,7 +132,7 @@ QT_END_NAMESPACE
 
     auto nsImage = [[[NSImage alloc] initWithSize:NSZeroSize] autorelease];
 
-    for (QSize size : qAsConst(availableSizes)) {
+    for (QSize size : std::as_const(availableSizes)) {
         QImage image = icon.pixmap(size).toImage();
         if (image.isNull())
             continue;
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index a424954ad4..7e1b31dc8e 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -381,7 +381,7 @@ void QPainterPrivate::draw_helper(const QPainterPath &originalPath, DrawOperatio
 
     if (q->hasClipping()) {
         bool hasPerspectiveTransform = false;
-        for (const QPainterClipInfo &info : qAsConst(state->clipInfo)) {
+        for (const QPainterClipInfo &info : std::as_const(state->clipInfo)) {
             if (info.matrix.type() == QTransform::TxProject) {
                 hasPerspectiveTransform = true;
                 break;
@@ -1616,7 +1616,7 @@ void QPainter::restore()
         tmp->clipPath = QPainterPath();
         d->engine->updateState(*tmp);
         // replay the list of clip states,
-        for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
+        for (const QPainterClipInfo &info : std::as_const(d->state->clipInfo)) {
             tmp->matrix = info.matrix;
             tmp->matrix *= d->state->redirectionMatrix;
             tmp->clipOperation = info.operation;
@@ -2478,7 +2478,7 @@ QRegion QPainter::clipRegion() const
         const_cast<QPainter *>(this)->d_ptr->updateInvMatrix();
 
     // ### Falcon: Use QPainterPath
-    for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
+    for (const QPainterClipInfo &info : std::as_const(d->state->clipInfo)) {
         switch (info.clipType) {
 
         case QPainterClipInfo::RegionClip: {
@@ -2645,7 +2645,7 @@ QRectF QPainter::clipBoundingRect() const
     // fast.
     QRectF bounds;
     bool first = true;
-    for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
+    for (const QPainterClipInfo &info : std::as_const(d->state->clipInfo)) {
          QRectF r;
 
          if (info.clipType == QPainterClipInfo::RectClip)
diff --git a/src/gui/platform/unix/dbustray/qdbustraytypes.cpp b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp
index b2d87d7b8c..accbd87e7e 100644
--- a/src/gui/platform/unix/dbustray/qdbustraytypes.cpp
+++ b/src/gui/platform/unix/dbustray/qdbustraytypes.cpp
@@ -45,7 +45,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
     bool hasSmallIcon = false;
     bool hasMediumIcon = false;
     QList<QSize> toRemove;
-    for (const QSize &size : qAsConst(sizes)) {
+    for (const QSize &size : std::as_const(sizes)) {
         int maxSize = qMax(size.width(), size.height());
         if (maxSize <= IconNormalSmallSize)
             hasSmallIcon = true;
@@ -54,7 +54,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
         else if (maxSize > IconSizeLimit)
             toRemove << size;
     }
-    for (const QSize &size : qAsConst(toRemove))
+    for (const QSize &size : std::as_const(toRemove))
         sizes.removeOne(size);
     if (!hasSmallIcon)
         sizes.append(QSize(IconNormalSmallSize, IconNormalSmallSize));
@@ -62,7 +62,7 @@ QXdgDBusImageVector iconToQXdgDBusImageVector(const QIcon &icon)
         sizes.append(QSize(IconNormalMediumSize, IconNormalMediumSize));
 
     ret.reserve(sizes.size());
-    for (const QSize &size : qAsConst(sizes)) {
+    for (const QSize &size : std::as_const(sizes)) {
         // Protocol specifies ARGB32 format in network byte order
         QImage im = engine->pixmap(size, QIcon::Normal, QIcon::Off).toImage().convertToFormat(QImage::Format_ARGB32);
         // letterbox if necessary to make it square
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
index b3ee0f4948..fd368f8282 100644
--- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp
@@ -461,7 +461,7 @@ QList<xkb_keysym_t> QXkbCommon::toKeysym(QKeyEvent *event)
     // From libxkbcommon keysym-utf.c:
     // "We allow to represent any UCS character in the range U-00000000 to
     // U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff."
-    for (uint utf32 : qAsConst(ucs4))
+    for (uint utf32 : std::as_const(ucs4))
         keysyms.append(utf32 | 0x01000000);
 
     return keysyms;
@@ -682,7 +682,7 @@ QList<int> QXkbCommon::possibleKeys(xkb_state *state, const QKeyEvent *event,
             // catch only more specific shortcuts, i.e. Ctrl+Shift+= also generates Ctrl++ and +,
             // but Ctrl++ is more specific than +, so we should skip the last one
             bool ambiguous = false;
-            for (int shortcut : qAsConst(result)) {
+            for (int shortcut : std::as_const(result)) {
                 if (int(shortcut & ~Qt::KeyboardModifierMask) == qtKey && (shortcut & mods) == mods) {
                     ambiguous = true;
                     break;
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index afe79c6687..3821062c8e 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -3357,7 +3357,7 @@ void QRhiImplementation::updateLayoutDesc(QRhiShaderResourceBindings *srb)
     srb->m_layoutDescHash = 0;
     srb->m_layoutDesc.clear();
     auto layoutDescAppender = std::back_inserter(srb->m_layoutDesc);
-    for (const QRhiShaderResourceBinding &b : qAsConst(srb->m_bindings)) {
+    for (const QRhiShaderResourceBinding &b : std::as_const(srb->m_bindings)) {
         const QRhiShaderResourceBinding::Data *d = b.data();
         srb->m_layoutDescHash ^= uint(d->binding) ^ uint(d->stage) ^ uint(d->type)
             ^ uint(d->arraySize());
@@ -5123,7 +5123,7 @@ QRhiImplementation::~QRhiImplementation()
             qWarning("QRhi %p going down with %d unreleased resources that own native graphics objects. This is not nice.",
                      q, int(resources.size()));
         }
-        for (QRhiResource *res : qAsConst(resources)) {
+        for (QRhiResource *res : std::as_const(resources)) {
             if (leakCheck)
                 qWarning("  %s resource %p (%s)", resourceTypeStr(res), res, res->m_objectName.constData());
 
@@ -5750,7 +5750,7 @@ void QRhi::addCleanupCallback(const CleanupCallback &callback)
  */
 void QRhi::runCleanup()
 {
-    for (const CleanupCallback &f : qAsConst(d->cleanupCallbacks))
+    for (const CleanupCallback &f : std::as_const(d->cleanupCallbacks))
         f(this);
 
     d->cleanupCallbacks.clear();
diff --git a/src/gui/rhi/qrhi_p_p.h b/src/gui/rhi/qrhi_p_p.h
index bf596abef1..7ac0184a16 100644
--- a/src/gui/rhi/qrhi_p_p.h
+++ b/src/gui/rhi/qrhi_p_p.h
@@ -188,7 +188,7 @@ public:
 
     void runGpuFrameTimeCallbacks(float t)
     {
-        for (const QRhi::GpuFrameTimeCallback &f : qAsConst(gpuFrameTimeCallbacks))
+        for (const QRhi::GpuFrameTimeCallback &f : std::as_const(gpuFrameTimeCallbacks))
             f(t);
     }
 
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
index 2a69474433..3ef1fa394e 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -1678,7 +1678,7 @@ void QRhiD3D11::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdate
             QD3D11Texture *texD = QRHI_RES(QD3D11Texture, u.dst);
             for (int layer = 0, maxLayer = u.subresDesc.count(); layer < maxLayer; ++layer) {
                 for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level]))
                         enqueueSubresUpload(texD, cbD, layer, level, subresDesc);
                 }
             }
@@ -4289,7 +4289,7 @@ bool QD3D11GraphicsPipeline::create()
     }
 
     QByteArray vsByteCode;
-    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+    for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
         auto cacheIt = rhiD->m_shaderCache.constFind(shaderStage);
         if (cacheIt != rhiD->m_shaderCache.constEnd()) {
             switch (shaderStage.type()) {
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index 5d0d6f503f..a45915495e 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -2251,7 +2251,7 @@ void QRhiGles2::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdate
             QGles2Texture *texD = QRHI_RES(QGles2Texture, u.dst);
             for (int layer = 0, maxLayer = u.subresDesc.size(); layer < maxLayer; ++layer) {
                 for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level]))
                         enqueueSubresUpload(texD, cbD, layer, level, subresDesc);
                 }
             }
@@ -3599,7 +3599,7 @@ void QRhiGles2::bindShaderResources(QGles2CommandBuffer *cbD,
             }
             QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.ubuf.buf);
             const char *bufView = bufD->data.constData() + viewOffset;
-            for (const QGles2UniformDescription &uniform : qAsConst(uniforms)) {
+            for (const QGles2UniformDescription &uniform : std::as_const(uniforms)) {
                 if (uniform.binding == b->binding) {
                     // in a uniform buffer everything is at least 4 byte aligned
                     // so this should not cause unaligned reads
@@ -5531,7 +5531,7 @@ bool QGles2GraphicsPipeline::create()
     };
     QShaderDescription desc[LastIdx];
     QShader::SeparateToCombinedImageSamplerMappingList samplerMappingList[LastIdx];
-    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+    for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
         if (isGraphicsStage(shaderStage)) {
             const int idx = descIdxForStage(shaderStage);
             QShader shader = shaderStage.shader();
@@ -5554,7 +5554,7 @@ bool QGles2GraphicsPipeline::create()
         return false;
 
     if (cacheResult == QRhiGles2::ProgramCacheMiss) {
-        for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+        for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
             if (isGraphicsStage(shaderStage)) {
                 if (!rhiD->compileShader(program, shaderStage, nullptr))
                     return false;
@@ -5593,7 +5593,7 @@ bool QGles2GraphicsPipeline::create()
     // present in both shaders.
     QDuplicateTracker<int, 256> activeUniformLocations;
 
-    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+    for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
         if (isGraphicsStage(shaderStage)) {
             const int idx = descIdxForStage(shaderStage);
             for (const QShaderDescription::UniformBlock &ub : desc[idx].uniformBlocks())
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index b0926d5e21..731d60ecf4 100644
--- a/src/gui/rhi/qrhimetal.mm
+++ b/src/gui/rhi/qrhimetal.mm
@@ -1164,7 +1164,7 @@ void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD
 {
     QMetalShaderResourceBindingsData bindingData;
 
-    for (const QRhiShaderResourceBinding &binding : qAsConst(srbD->sortedBindings)) {
+    for (const QRhiShaderResourceBinding &binding : std::as_const(srbD->sortedBindings)) {
         const QRhiShaderResourceBinding::Data *b = binding.data();
         switch (b->type) {
         case QRhiShaderResourceBinding::UniformBuffer:
@@ -1306,7 +1306,7 @@ void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD
             return a.nativeBinding < b.nativeBinding;
         });
 
-        for (const QMetalShaderResourceBindingsData::Stage::Buffer &buf : qAsConst(bindingData.res[stage].buffers)) {
+        for (const QMetalShaderResourceBindingsData::Stage::Buffer &buf : std::as_const(bindingData.res[stage].buffers)) {
             bindingData.res[stage].bufferBatches.feed(buf.nativeBinding, buf.mtlbuf);
             bindingData.res[stage].bufferOffsetBatches.feed(buf.nativeBinding, buf.offset);
         }
@@ -1339,10 +1339,10 @@ void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD
             return a.nativeBinding < b.nativeBinding;
         });
 
-        for (const QMetalShaderResourceBindingsData::Stage::Texture &t : qAsConst(bindingData.res[stage].textures))
+        for (const QMetalShaderResourceBindingsData::Stage::Texture &t : std::as_const(bindingData.res[stage].textures))
             bindingData.res[stage].textureBatches.feed(t.nativeBinding, t.mtltex);
 
-        for (const QMetalShaderResourceBindingsData::Stage::Sampler &s : qAsConst(bindingData.res[stage].samplers))
+        for (const QMetalShaderResourceBindingsData::Stage::Sampler &s : std::as_const(bindingData.res[stage].samplers))
             bindingData.res[stage].samplerBatches.feed(s.nativeBinding, s.mtlsampler);
 
         bindingData.res[stage].textureBatches.finish();
@@ -2050,7 +2050,7 @@ QRhi::FrameOpResult QRhiMetal::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginF
     // commands+present to complete, while for others just for the commands
     // (for this same frame slot) but not sure how to do that in a sane way so
     // wait for full cb completion for now.
-    for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+    for (QMetalSwapChain *sc : std::as_const(swapchains)) {
         dispatch_semaphore_t sem = sc->d->sem[swapChainD->currentFrameSlot];
         dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
         if (sc != swapChainD)
@@ -2144,7 +2144,7 @@ QRhi::FrameOpResult QRhiMetal::beginOffscreenFrame(QRhiCommandBuffer **cb, QRhi:
 
     currentFrameSlot = (currentFrameSlot + 1) % QMTL_FRAMES_IN_FLIGHT;
     if (swapchains.count() > 1) {
-        for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+        for (QMetalSwapChain *sc : std::as_const(swapchains)) {
             // wait+signal is the general pattern to ensure the commands for a
             // given frame slot have completed (if sem is 1, we go 0 then 1; if
             // sem is 0 we go -1, block, completion increments to 0, then us to 1)
@@ -2198,7 +2198,7 @@ QRhi::FrameOpResult QRhiMetal::finish()
         }
     }
 
-    for (QMetalSwapChain *sc : qAsConst(swapchains)) {
+    for (QMetalSwapChain *sc : std::as_const(swapchains)) {
         for (int i = 0; i < QMTL_FRAMES_IN_FLIGHT; ++i) {
             if (currentSwapChain && sc == currentSwapChain && i == currentFrameSlot) {
                 // no wait as this is the thing we're going to be commit below and
@@ -2446,7 +2446,7 @@ void QRhiMetal::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdate
             qsizetype stagingSize = 0;
             for (int layer = 0, maxLayer = u.subresDesc.count(); layer < maxLayer; ++layer) {
                 for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level]))
                         stagingSize += subresUploadByteSize(subresDesc);
                 }
             }
@@ -2460,7 +2460,7 @@ void QRhiMetal::enqueueResourceUpdates(QRhiCommandBuffer *cb, QRhiResourceUpdate
             qsizetype curOfs = 0;
             for (int layer = 0, maxLayer = u.subresDesc.count(); layer < maxLayer; ++layer) {
                 for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level]))
                         enqueueSubresUpload(utexD, mp, blitEnc, layer, level, subresDesc, &curOfs);
                 }
             }
@@ -2573,7 +2573,7 @@ void QRhiMetal::executeBufferHostWritesForSlot(QMetalBuffer *bufD, int slot)
     void *p = [bufD->d->buf[slot] contents];
     quint32 changeBegin = UINT32_MAX;
     quint32 changeEnd = 0;
-    for (const QMetalBufferData::BufferUpdate &u : qAsConst(bufD->d->pendingUpdates[slot])) {
+    for (const QMetalBufferData::BufferUpdate &u : std::as_const(bufD->d->pendingUpdates[slot])) {
         memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
         if (u.offset < changeBegin)
             changeBegin = u.offset;
@@ -4511,7 +4511,7 @@ bool QMetalGraphicsPipeline::createVertexFragmentPipeline()
     // buffers not just the resource binding layout), so leave
     // rpDesc.vertex/fragmentBuffers at the defaults.
 
-    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+    for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
         auto cacheIt = rhiD->d->shaderCache.constFind(shaderStage);
         if (cacheIt != rhiD->d->shaderCache.constEnd()) {
             switch (shaderStage.type()) {
@@ -5131,7 +5131,7 @@ bool QMetalGraphicsPipeline::create()
     QShader tesc;
     QShader tese;
     QShader tessFrag;
-    for (const QRhiShaderStage &shaderStage : qAsConst(m_shaderStages)) {
+    for (const QRhiShaderStage &shaderStage : std::as_const(m_shaderStages)) {
         switch (shaderStage.type()) {
         case QRhiShaderStage::Vertex:
             tessVert = shaderStage.shader();
diff --git a/src/gui/rhi/qrhinull.cpp b/src/gui/rhi/qrhinull.cpp
index 5728e428b3..b0c3c559c4 100644
--- a/src/gui/rhi/qrhinull.cpp
+++ b/src/gui/rhi/qrhinull.cpp
@@ -384,7 +384,7 @@ void QRhiNull::simulateTextureUpload(const QRhiResourceUpdateBatchPrivate::Textu
     QNullTexture *texD = QRHI_RES(QNullTexture, u.dst);
     for (int layer = 0, maxLayer = u.subresDesc.size(); layer < maxLayer; ++layer) {
         for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-            for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level])) {
+            for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level])) {
                 if (!subresDesc.image().isNull()) {
                     const QImage src = subresDesc.image();
                     QPainter painter(&texD->image[layer][level]);
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index 06e7fbcc38..daf934f1d3 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -544,7 +544,7 @@ bool QRhiVulkan::create(QRhi::Flags flags)
         if (devExtCount) {
             QList<VkExtensionProperties> extProps(devExtCount);
             f->vkEnumerateDeviceExtensionProperties(physDev, nullptr, &devExtCount, extProps.data());
-            for (const VkExtensionProperties &p : qAsConst(extProps))
+            for (const VkExtensionProperties &p : std::as_const(extProps))
                 devExts.append({ p.extensionName, p.specVersion });
         }
         qCDebug(QRHI_LOG_INFO, "%d device extensions available", int(devExts.count()));
@@ -2071,7 +2071,7 @@ QRhi::FrameOpResult QRhiVulkan::endAndSubmitPrimaryCommandBuffer(VkCommandBuffer
 
 void QRhiVulkan::waitCommandCompletion(int frameSlot)
 {
-    for (QVkSwapChain *sc : qAsConst(swapchains)) {
+    for (QVkSwapChain *sc : std::as_const(swapchains)) {
         const int frameResIndex = sc->bufferCount > 1 ? frameSlot : 0;
         QVkSwapChain::FrameResources &frame(sc->frameRes[frameResIndex]);
         if (frame.cmdFenceWaitable) {
@@ -3267,7 +3267,7 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
             VkDeviceSize stagingSize = 0;
             for (int layer = 0, maxLayer = u.subresDesc.size(); layer < maxLayer; ++layer) {
                 for (int level = 0; level < QRhi::MAX_MIP_LEVELS; ++level) {
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(u.subresDesc[layer][level]))
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(u.subresDesc[layer][level]))
                         stagingSize += subresUploadByteSize(subresDesc);
                 }
             }
@@ -3305,7 +3305,7 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
                     const QList<QRhiTextureSubresourceUploadDescription> &srd(u.subresDesc[layer][level]);
                     if (srd.isEmpty())
                         continue;
-                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : qAsConst(srd)) {
+                    for (const QRhiTextureSubresourceUploadDescription &subresDesc : std::as_const(srd)) {
                         prepareUploadSubres(utexD, layer, level,
                                             subresDesc, &curOfs, mp, &copyInfos);
                     }
@@ -3608,7 +3608,7 @@ void QRhiVulkan::executeBufferHostWritesForSlot(QVkBuffer *bufD, int slot)
     }
     quint32 changeBegin = UINT32_MAX;
     quint32 changeEnd = 0;
-    for (const QVkBuffer::DynamicUpdate &u : qAsConst(bufD->pendingDynamicUpdates[slot])) {
+    for (const QVkBuffer::DynamicUpdate &u : std::as_const(bufD->pendingDynamicUpdates[slot])) {
         memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), u.data.size());
         if (u.offset < changeBegin)
             changeBegin = u.offset;
@@ -4782,7 +4782,7 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin
             // because dynOfs has to be ordered based on the binding numbers,
             // and neither srb nor dynamicOffsets has any such ordering
             // requirement.
-            for (const QRhiShaderResourceBinding &binding : qAsConst(srbD->sortedBindings)) {
+            for (const QRhiShaderResourceBinding &binding : std::as_const(srbD->sortedBindings)) {
                 const QRhiShaderResourceBinding::Data *b = binding.data();
                 if (b->type == QRhiShaderResourceBinding::UniformBuffer && b->u.ubuf.hasDynamicOffset) {
                     uint32_t offset = 0;
@@ -6764,7 +6764,7 @@ bool QVkShaderResourceBindings::create()
 
     hasSlottedResource = false;
     hasDynamicOffset = false;
-    for (const QRhiShaderResourceBinding &binding : qAsConst(sortedBindings)) {
+    for (const QRhiShaderResourceBinding &binding : std::as_const(sortedBindings)) {
         const QRhiShaderResourceBinding::Data *b = binding.data();
         if (b->type == QRhiShaderResourceBinding::UniformBuffer && b->u.ubuf.buf) {
             if (QRHI_RES(QVkBuffer, b->u.ubuf.buf)->type() == QRhiBuffer::Dynamic)
@@ -6775,7 +6775,7 @@ bool QVkShaderResourceBindings::create()
     }
 
     QVarLengthArray<VkDescriptorSetLayoutBinding, 4> vkbindings;
-    for (const QRhiShaderResourceBinding &binding : qAsConst(sortedBindings)) {
+    for (const QRhiShaderResourceBinding &binding : std::as_const(sortedBindings)) {
         const QRhiShaderResourceBinding::Data *b = binding.data();
         VkDescriptorSetLayoutBinding vkbinding = {};
         vkbinding.binding = uint32_t(b->binding);
@@ -7074,7 +7074,7 @@ bool QVkGraphicsPipeline::create()
     VkPipelineColorBlendStateCreateInfo blendInfo = {};
     blendInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
     QVarLengthArray<VkPipelineColorBlendAttachmentState, 4> vktargetBlends;
-    for (const QRhiGraphicsPipeline::TargetBlend &b : qAsConst(m_targetBlends)) {
+    for (const QRhiGraphicsPipeline::TargetBlend &b : std::as_const(m_targetBlends)) {
         VkPipelineColorBlendAttachmentState blend = {};
         blend.blendEnable = b.enable;
         blend.srcColorBlendFactor = toVkBlendFactor(b.srcColor);
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp
index c701265bc6..387ebc7c53 100644
--- a/src/gui/rhi/qshaderdescription.cpp
+++ b/src/gui/rhi/qshaderdescription.cpp
@@ -1136,13 +1136,13 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
     QJsonObject root;
 
     QJsonArray jinputs;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(inVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(inVars))
         jinputs.append(inOutObject(v));
     if (!jinputs.isEmpty())
         root[inputsKey()] = jinputs;
 
     QJsonArray joutputs;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(outVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(outVars))
         joutputs.append(inOutObject(v));
     if (!joutputs.isEmpty())
         root[outputsKey()] = joutputs;
@@ -1200,7 +1200,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[storageBlocksKey()] = jstorageBlocks;
 
     QJsonArray jcombinedSamplers;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(combinedImageSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(combinedImageSamplers)) {
         QJsonObject sampler;
         sampler[nameKey()] = QString::fromUtf8(v.name);
         sampler[typeKey()] = typeStr(v.type);
@@ -1211,7 +1211,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[combinedImageSamplersKey()] = jcombinedSamplers;
 
     QJsonArray jstorageImages;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(storageImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(storageImages)) {
         QJsonObject image;
         image[nameKey()] = QString::fromUtf8(v.name);
         image[typeKey()] = typeStr(v.type);
@@ -1222,7 +1222,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[storageImagesKey()] = jstorageImages;
 
     QJsonArray jinBuiltins;
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(inBuiltins)) {
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(inBuiltins)) {
         QJsonObject builtin;
         builtin[typeKey()] = builtinTypeStr(v.type);
         jinBuiltins.append(builtin);
@@ -1231,7 +1231,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[inBuiltinsKey()] = jinBuiltins;
 
     QJsonArray joutBuiltins;
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(outBuiltins)) {
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(outBuiltins)) {
         QJsonObject builtin;
         builtin[typeKey()] = builtinTypeStr(v.type);
         joutBuiltins.append(builtin);
@@ -1259,7 +1259,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[tessellationPartitioningKey()] = tessPartStr(tessPart);
 
     QJsonArray jseparateImages;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateImages)) {
         QJsonObject image;
         image[nameKey()] = QString::fromUtf8(v.name);
         image[typeKey()] = typeStr(v.type);
@@ -1270,7 +1270,7 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
         root[separateImagesKey()] = jseparateImages;
 
     QJsonArray jseparateSamplers;
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateSamplers)) {
         QJsonObject sampler;
         sampler[nameKey()] = QString::fromUtf8(v.name);
         sampler[typeKey()] = typeStr(v.type);
@@ -1286,11 +1286,11 @@ QJsonDocument QShaderDescriptionPrivate::makeDoc()
 void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
 {
     (*stream) << int(inVars.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(inVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(inVars))
         serializeInOutVar(stream, v);
 
     (*stream) << int(outVars.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(outVars))
+    for (const QShaderDescription::InOutVariable &v : std::as_const(outVars))
         serializeInOutVar(stream, v);
 
     (*stream) << int(uniformBlocks.size());
@@ -1327,14 +1327,14 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
     }
 
     (*stream) << int(combinedImageSamplers.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(combinedImageSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(combinedImageSamplers)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
     }
 
     (*stream) << int(storageImages.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(storageImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(storageImages)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
@@ -1344,14 +1344,14 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
         (*stream) << quint32(localSize[i]);
 
     (*stream) << int(separateImages.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateImages)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateImages)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
     }
 
     (*stream) << int(separateSamplers.size());
-    for (const QShaderDescription::InOutVariable &v : qAsConst(separateSamplers)) {
+    for (const QShaderDescription::InOutVariable &v : std::as_const(separateSamplers)) {
         (*stream) << QString::fromUtf8(v.name);
         (*stream) << int(v.type);
         serializeDecorations(stream, v);
@@ -1363,11 +1363,11 @@ void QShaderDescriptionPrivate::writeToStream(QDataStream *stream)
     (*stream) << quint32(tessPart);
 
     (*stream) << int(inBuiltins.size());
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(inBuiltins))
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(inBuiltins))
         (*stream) << int(v.type);
 
     (*stream) << int(outBuiltins.size());
-    for (const QShaderDescription::BuiltinVariable &v : qAsConst(outBuiltins))
+    for (const QShaderDescription::BuiltinVariable &v : std::as_const(outBuiltins))
         (*stream) << int(v.type);
 }
 
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 0b9be23271..7c4ca0abc2 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -202,7 +202,7 @@ void QTextDocumentPrivate::clear()
 {
     Q_Q(QTextDocument);
 
-    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
+    for (QTextCursorPrivate *curs : std::as_const(cursors)) {
         curs->setPosition(0);
         curs->currentCharFormat = -1;
         curs->anchor = 0;
@@ -255,7 +255,7 @@ void QTextDocumentPrivate::clear()
 
 QTextDocumentPrivate::~QTextDocumentPrivate()
 {
-    for (QTextCursorPrivate *curs : qAsConst(cursors))
+    for (QTextCursorPrivate *curs : std::as_const(cursors))
         curs->priv = nullptr;
     cursors.clear();
     undoState = 0;
@@ -646,7 +646,7 @@ void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operati
     blockCursorAdjustment = true;
     move(pos, -1, length, op);
     blockCursorAdjustment = false;
-    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
+    for (QTextCursorPrivate *curs : std::as_const(cursors)) {
         if (curs->adjustPosition(pos, -length, op) == QTextCursorPrivate::CursorMoved) {
             curs->changed = true;
         }
@@ -1204,13 +1204,13 @@ void QTextDocumentPrivate::finishEdit()
     }
 
     QList<QTextCursor> changedCursors;
-    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
+    for (QTextCursorPrivate *curs : std::as_const(cursors)) {
         if (curs->changed) {
             curs->changed = false;
             changedCursors.append(QTextCursor(curs));
         }
     }
-    for (const QTextCursor &cursor : qAsConst(changedCursors))
+    for (const QTextCursor &cursor : std::as_const(changedCursors))
         emit q->cursorPositionChanged(cursor);
 
     contentsChanged();
@@ -1256,7 +1256,7 @@ void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOr
     if (blockCursorAdjustment)  {
         ; // postpone, will be called again from QTextDocumentPrivate::remove()
     } else {
-        for (QTextCursorPrivate *curs : qAsConst(cursors)) {
+        for (QTextCursorPrivate *curs : std::as_const(cursors)) {
             if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
                 curs->changed = true;
             }
@@ -1703,7 +1703,7 @@ bool QTextDocumentPrivate::ensureMaximumBlockCount()
 void QTextDocumentPrivate::aboutToRemoveCell(int from, int to)
 {
     Q_ASSERT(from <= to);
-    for (QTextCursorPrivate *curs : qAsConst(cursors))
+    for (QTextCursorPrivate *curs : std::as_const(cursors))
         curs->aboutToRemoveCell(from, to);
 }
 
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index e96f7cf995..7d8b2eaa93 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -931,7 +931,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
     QList<RowColSpanInfo> rowColSpanForColumn;
 
     int effectiveRow = 0;
-    for (int row : qAsConst(rowNodes)) {
+    for (int row : std::as_const(rowNodes)) {
         int colsInRow = 0;
 
         for (int cell : at(row).children) {
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index e1392008c7..1c1da979c8 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1979,7 +1979,7 @@ void QTextEngine::itemize() const
                         ? formatCollection()->charFormat(format).fontCapitalization()
                         : formatCollection()->defaultFont().capitalization();
                 if (s) {
-                    for (const auto &range : qAsConst(s->formats)) {
+                    for (const auto &range : std::as_const(s->formats)) {
                         if (range.start + range.length <= prevPosition || range.start >= position)
                             continue;
                         if (range.format.hasProperty(QTextFormat::FontCapitalization)) {
@@ -3165,7 +3165,7 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const
                 }
             }
         }
-        for (const QTextOption::Tab &tabSpec : qAsConst(tabArray)) {
+        for (const QTextOption::Tab &tabSpec : std::as_const(tabArray)) {
             QFixed tab = QFixed::fromReal(tabSpec.position) * dpiScale;
             if (tab > x) {  // this is the tab we need.
                 int tabSectionEnd = layoutData->string.size();
diff --git a/src/gui/text/unix/qfontenginemultifontconfig.cpp b/src/gui/text/unix/qfontenginemultifontconfig.cpp
index 4e0a47a112..6419a764f7 100644
--- a/src/gui/text/unix/qfontenginemultifontconfig.cpp
+++ b/src/gui/text/unix/qfontenginemultifontconfig.cpp
@@ -14,7 +14,7 @@ QFontEngineMultiFontConfig::QFontEngineMultiFontConfig(QFontEngine *fe, int scri
 
 QFontEngineMultiFontConfig::~QFontEngineMultiFontConfig()
 {
-    for (FcPattern *pattern : qAsConst(cachedMatchPatterns)) {
+    for (FcPattern *pattern : std::as_const(cachedMatchPatterns)) {
         if (pattern)
             FcPatternDestroy(pattern);
     }
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index b3949402e9..2de53be6a8 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -1075,7 +1075,7 @@ QStringList QWindowsFontDatabase::addApplicationFont(const QByteArray &fontData,
 
 void QWindowsFontDatabase::removeApplicationFonts()
 {
-    for (const WinApplicationFont &font : qAsConst(m_applicationFonts)) {
+    for (const WinApplicationFont &font : std::as_const(m_applicationFonts)) {
         if (font.handle) {
             RemoveFontMemResourceEx(font.handle);
         } else {
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
index 9323258e1d..a674d71592 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp
@@ -147,7 +147,7 @@ void QBasicPlatformVulkanInstance::init(QLibrary *lib)
         QList<VkLayerProperties> layerProps(layerCount);
         m_vkEnumerateInstanceLayerProperties(&layerCount, layerProps.data());
         m_supportedLayers.reserve(layerCount);
-        for (const VkLayerProperties &p : qAsConst(layerProps)) {
+        for (const VkLayerProperties &p : std::as_const(layerProps)) {
             QVulkanLayer layer;
             layer.name = p.layerName;
             layer.version = p.implementationVersion;
@@ -166,7 +166,7 @@ void QBasicPlatformVulkanInstance::init(QLibrary *lib)
         QList<VkExtensionProperties> extProps(extCount);
         m_vkEnumerateInstanceExtensionProperties(nullptr, &extCount, extProps.data());
         m_supportedExtensions.reserve(extCount);
-        for (const VkExtensionProperties &p : qAsConst(extProps)) {
+        for (const VkExtensionProperties &p : std::as_const(extProps)) {
             QVulkanExtension ext;
             ext.name = p.extensionName;
             ext.version = p.specVersion;
@@ -263,7 +263,7 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const
             instInfo.flags |= 0x00000001; // VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
 
         QList<const char *> layerNameVec;
-        for (const QByteArray &ba : qAsConst(m_enabledLayers))
+        for (const QByteArray &ba : std::as_const(m_enabledLayers))
             layerNameVec.append(ba.constData());
         if (!layerNameVec.isEmpty()) {
             instInfo.enabledLayerCount = layerNameVec.size();
@@ -271,7 +271,7 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const
         }
 
         QList<const char *> extNameVec;
-        for (const QByteArray &ba : qAsConst(m_enabledExtensions))
+        for (const QByteArray &ba : std::as_const(m_enabledExtensions))
             extNameVec.append(ba.constData());
         if (!extNameVec.isEmpty()) {
             instInfo.enabledExtensionCount = extNameVec.size();
diff --git a/src/gui/vulkan/qvulkanwindow.cpp b/src/gui/vulkan/qvulkanwindow.cpp
index dbeb22fcb2..5a86b43290 100644
--- a/src/gui/vulkan/qvulkanwindow.cpp
+++ b/src/gui/vulkan/qvulkanwindow.cpp
@@ -657,7 +657,7 @@ void QVulkanWindowPrivate::init()
         queueCreateInfoModifier(queueFamilyProps.constData(), queueCount, queueInfo);
         bool foundGfxQueue = false;
         bool foundPresQueue = false;
-        for (const VkDeviceQueueCreateInfo& createInfo : qAsConst(queueInfo)) {
+        for (const VkDeviceQueueCreateInfo& createInfo : std::as_const(queueInfo)) {
             foundGfxQueue |= createInfo.queueFamilyIndex == gfxQueueFamilyIdx;
             foundPresQueue |= createInfo.queueFamilyIndex == presQueueFamilyIdx;
         }
@@ -857,7 +857,7 @@ void QVulkanWindowPrivate::init()
 
     // Try to honor the user request.
     if (!formats.isEmpty() && !requestedColorFormats.isEmpty()) {
-        for (VkFormat reqFmt : qAsConst(requestedColorFormats)) {
+        for (VkFormat reqFmt : std::as_const(requestedColorFormats)) {
             auto r = std::find_if(formats.cbegin(), formats.cend(),
                                   [reqFmt](const VkSurfaceFormatKHR &sfmt) { return sfmt.format == reqFmt; });
             if (r != formats.cend()) {
diff --git a/src/network/access/qhstsstore.cpp b/src/network/access/qhstsstore.cpp
index 80bb06d656..a972a90ee7 100644
--- a/src/network/access/qhstsstore.cpp
+++ b/src/network/access/qhstsstore.cpp
@@ -80,7 +80,7 @@ void QHstsStore::synchronize()
 
     if (observedPolicies.size()) {
         beginHstsGroups();
-        for (const QHstsPolicy &policy : qAsConst(observedPolicies)) {
+        for (const QHstsPolicy &policy : std::as_const(observedPolicies)) {
             const QString key(host_name_to_settings_key(policy.host()));
             // If we fail to write a new, updated policy, we also remove the old one.
             if (policy.isExpired() || !serializePolicy(key, policy))
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1f2b813a83..73bf8bebc3 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -1261,7 +1261,7 @@ void QHttpNetworkConnectionPrivate::_q_hostLookupFinished(const QHostInfo &info)
             networkLayerState = QHttpNetworkConnectionPrivate::Unknown;
         } else if (connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2
                    || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
-            for (const HttpMessagePair &h2Pair : qAsConst(channels[0].h2RequestsToSend)) {
+            for (const HttpMessagePair &h2Pair : std::as_const(channels[0].h2RequestsToSend)) {
                 // emit error for all replies
                 QHttpNetworkReply *currentReply = h2Pair.second;
                 Q_ASSERT(currentReply);
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index 53a443d41c..6b52b8d49a 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -510,7 +510,7 @@ qint64 QNetworkDiskCache::expire()
         QFile file(name);
 
         if (name.contains(PREPARED_SLASH)) {
-            for (QCacheItem *item : qAsConst(d->inserting)) {
+            for (QCacheItem *item : std::as_const(d->inserting)) {
                 if (item && item->file && item->file->fileName() == name) {
                     delete item->file;
                     item->file = nullptr;
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 854f9c8e6b..58e768583d 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -747,7 +747,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
         }
     }
 
-    for (const QByteArray &header : qAsConst(headers))
+    for (const QByteArray &header : std::as_const(headers))
         httpRequest.setHeaderField(header, newHttpRequest.rawHeader(header));
 
     if (newHttpRequest.attribute(QNetworkRequest::HttpPipeliningAllowedAttribute).toBool())
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index a1a72eae6a..023d652721 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -1067,7 +1067,7 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria
 
         QByteArray result;
         bool first = true;
-        for (const QNetworkCookie &cookie : qAsConst(cookies)) {
+        for (const QNetworkCookie &cookie : std::as_const(cookies)) {
             if (!first)
                 result += "; ";
             first = false;
@@ -1083,7 +1083,7 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria
 
         QByteArray result;
         bool first = true;
-        for (const QNetworkCookie &cookie : qAsConst(cookies)) {
+        for (const QNetworkCookie &cookie : std::as_const(cookies)) {
             if (!first)
                 result += ", ";
             first = false;
diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp
index d48784f1cd..16d8e4d040 100644
--- a/src/network/kernel/qnetworkinformation.cpp
+++ b/src/network/kernel/qnetworkinformation.cpp
@@ -187,7 +187,7 @@ QNetworkInformation *QNetworkInformationPrivate::create(QStringView name)
         } else {
             QString listNames;
             listNames.reserve(8 * dataHolder->factories.count());
-            for (const auto *factory : qAsConst(dataHolder->factories))
+            for (const auto *factory : std::as_const(dataHolder->factories))
                 listNames += factory->name() + QStringLiteral(", ");
             listNames.chop(2);
             qDebug().nospace() << "Couldn't find " << name << " in list with names: { "
@@ -243,7 +243,7 @@ QNetworkInformation *QNetworkInformationPrivate::create(QNetworkInformation::Fea
             } else {
                 QStringList names;
                 names.reserve(dataHolder->factories.count());
-                for (const auto *factory : qAsConst(dataHolder->factories))
+                for (const auto *factory : std::as_const(dataHolder->factories))
                     names += factory->name();
                 qDebug() << "None of the following backends has all the requested features:"
                          << names << features;
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index 8277f57a55..f03e85c7f6 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -873,7 +873,7 @@ QList<QHostAddress> QNetworkInterface::allAddresses()
         if ((p->flags & QNetworkInterface::IsUp) == 0)
             continue;
 
-        for (const QNetworkAddressEntry &entry : qAsConst(p->addressEntries))
+        for (const QNetworkAddressEntry &entry : std::as_const(p->addressEntries))
             result += entry.ip();
     }
 
diff --git a/src/network/kernel/qnetworkinterface_linux.cpp b/src/network/kernel/qnetworkinterface_linux.cpp
index 51fb23b547..622cd2976b 100644
--- a/src/network/kernel/qnetworkinterface_linux.cpp
+++ b/src/network/kernel/qnetworkinterface_linux.cpp
@@ -309,7 +309,7 @@ static void getAddresses(int sock, char *buf, QList<QNetworkInterfacePrivate *>
 
         // find the interface this is relevant to
         QNetworkInterfacePrivate *iface = nullptr;
-        for (auto candidate : qAsConst(result)) {
+        for (auto candidate : std::as_const(result)) {
             if (candidate->index != int(ifa->ifa_index))
                 continue;
             iface = candidate;
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index eb8b6ab6b1..a2daa62e84 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -295,9 +295,9 @@ public:
     }
 
     void clear() {
-        for (HANDLE event : qAsConst(m_watchEvents))
+        for (HANDLE event : std::as_const(m_watchEvents))
             CloseHandle(event);
-        for (HKEY key : qAsConst(m_registryHandles))
+        for (HKEY key : std::as_const(m_registryHandles))
             RegCloseKey(key);
 
         m_watchEvents.clear();
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 87607ef413..7d7db11e01 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -836,7 +836,7 @@ void QAbstractSocketPrivate::resolveProxy(const QString &hostname, quint16 port)
     }
 
     // return the first that we can use
-    for (const QNetworkProxy &p : qAsConst(proxies)) {
+    for (const QNetworkProxy &p : std::as_const(proxies)) {
         if (socketType == QAbstractSocket::UdpSocket &&
             (p.capabilities() & QNetworkProxy::UdpTunnelingCapability) == 0)
             continue;
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 593f26687e..cc748b9d7a 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -133,7 +133,7 @@ QNetworkProxy QTcpServerPrivate::resolveProxy(const QHostAddress &address, quint
     }
 
     // return the first that we can use
-    for (const QNetworkProxy &p : qAsConst(proxies)) {
+    for (const QNetworkProxy &p : std::as_const(proxies)) {
         if (socketType == QAbstractSocket::TcpSocket &&
             (p.capabilities() & QNetworkProxy::ListeningCapability) != 0)
             return p;
diff --git a/src/opengl/qopenglframebufferobject.cpp b/src/opengl/qopenglframebufferobject.cpp
index a0034adf74..9aa89350ec 100644
--- a/src/opengl/qopenglframebufferobject.cpp
+++ b/src/opengl/qopenglframebufferobject.cpp
@@ -993,7 +993,7 @@ QOpenGLFramebufferObject::~QOpenGLFramebufferObject()
     if (isBound())
         release();
 
-    for (const auto &color : qAsConst(d->colorAttachments)) {
+    for (const auto &color : std::as_const(d->colorAttachments)) {
         if (color.guard)
             color.guard->free();
     }
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp
index 6dab8ed70a..fb33bf0d5c 100644
--- a/src/opengl/qopenglshaderprogram.cpp
+++ b/src/opengl/qopenglshaderprogram.cpp
@@ -1230,7 +1230,7 @@ void QOpenGLShaderProgram::removeAllShaders()
 {
     Q_D(QOpenGLShaderProgram);
     d->removingShaders = true;
-    for (QOpenGLShader *shader : qAsConst(d->shaders)) {
+    for (QOpenGLShader *shader : std::as_const(d->shaders)) {
         if (d->programGuard && d->programGuard->id()
             && shader && shader->d_func()->shaderGuard)
         {
@@ -3727,7 +3727,7 @@ bool QOpenGLShaderProgramPrivate::isCacheDisabled() const
 bool QOpenGLShaderProgramPrivate::compileCacheable()
 {
     Q_Q(QOpenGLShaderProgram);
-    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) {
+    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : std::as_const(binaryProgram.shaders)) {
         auto s = std::make_unique<QOpenGLShader>(qt_shaderStageToType(shader.stage), q);
         if (!s->compileSourceCode(shader.source)) {
             log = s->log();
diff --git a/src/opengl/qopenglversionfunctions.cpp b/src/opengl/qopenglversionfunctions.cpp
index 0180fb542d..a03fa2c2d3 100644
--- a/src/opengl/qopenglversionfunctions.cpp
+++ b/src/opengl/qopenglversionfunctions.cpp
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 QOpenGLContextVersionData::~QOpenGLContextVersionData()
 {
-    for (auto *f : qAsConst(externalFunctions)) {
+    for (auto *f : std::as_const(externalFunctions)) {
         auto *fp = QAbstractOpenGLFunctionsPrivate::get(f);
         fp->owningContext = nullptr;
         fp->initialized = false;
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
index 2888ff06b3..43717c4e81 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
@@ -33,7 +33,7 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &
     m_spec = std::move(parsed.spec);
 
     // add all keyboards for devices specified in the argument list
-    for (const QString &device : qAsConst(parsed.devices))
+    for (const QString &device : std::as_const(parsed.devices))
         addKeyboard(device);
 
     if (parsed.devices.isEmpty()) {
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
index 32db2e897c..112fc62209 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@@ -34,7 +34,7 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
     auto parsed = QEvdevUtil::parseSpecification(spec);
     m_spec = std::move(parsed.spec);
 
-    for (const auto &arg : qAsConst(parsed.args)) {
+    for (const auto &arg : std::as_const(parsed.args)) {
         if (arg.startsWith("xoffset="_L1)) {
             m_xoffset = arg.mid(8).toInt();
         } else if (arg.startsWith("yoffset="_L1)) {
@@ -43,7 +43,7 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
     }
 
     // add all mice for devices specified in the argument list
-    for (const QString &device : qAsConst(parsed.devices))
+    for (const QString &device : std::as_const(parsed.devices))
         addMouse(device);
 
     if (parsed.devices.isEmpty()) {
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index d4bb9edc92..a270f9700d 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -33,7 +33,7 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
     auto parsed = QEvdevUtil::parseSpecification(spec);
     m_spec = std::move(parsed.spec);
 
-    for (const QString &device : qAsConst(parsed.devices))
+    for (const QString &device : std::as_const(parsed.devices))
         addDevice(device);
 
     // when no devices specified, use device discovery to scan and monitor
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
index ce885d0a3b..f2a652c254 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
@@ -33,7 +33,7 @@ QEvdevTouchManager::QEvdevTouchManager(const QString &key, const QString &specif
     auto parsed = QEvdevUtil::parseSpecification(spec);
     m_spec = std::move(parsed.spec);
 
-    for (const QString &device : qAsConst(parsed.devices))
+    for (const QString &device : std::as_const(parsed.devices))
         addDevice(device);
 
     // when no devices specified, use device discovery to scan and monitor
diff --git a/src/platformsupport/input/shared/qevdevutil.cpp b/src/platformsupport/input/shared/qevdevutil.cpp
index 4557ac9def..c1ebb9ada0 100644
--- a/src/platformsupport/input/shared/qevdevutil.cpp
+++ b/src/platformsupport/input/shared/qevdevutil.cpp
@@ -15,7 +15,7 @@ ParsedSpecification parseSpecification(const QString &specification)
 
     result.args = QStringView{specification}.split(u':');
 
-    for (const auto &arg : qAsConst(result.args)) {
+    for (const auto &arg : std::as_const(result.args)) {
         if (arg.startsWith("/dev/"_L1)) {
             // if device is specified try to use it
             result.devices.append(arg.toString());
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index 07f0589078..145352973d 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -136,7 +136,7 @@ void QTuioHandler::processPackets()
             messages.push_back(msg);
         }
 
-        for (const QOscMessage &message : qAsConst(messages)) {
+        for (const QOscMessage &message : std::as_const(messages)) {
             if (message.addressPattern() == "/tuio/2Dcur") {
                 QList<QVariant> arguments = message.arguments();
                 if (arguments.size() == 0) {
@@ -335,12 +335,12 @@ void QTuioHandler::process2DCurFseq(const QOscMessage &message)
     QList<QWindowSystemInterface::TouchPoint> tpl;
     tpl.reserve(m_activeCursors.size() + m_deadCursors.size());
 
-    for (const QTuioCursor &tc : qAsConst(m_activeCursors)) {
+    for (const QTuioCursor &tc : std::as_const(m_activeCursors)) {
         QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
         tpl.append(tp);
     }
 
-    for (const QTuioCursor &tc : qAsConst(m_deadCursors)) {
+    for (const QTuioCursor &tc : std::as_const(m_deadCursors)) {
         QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win);
         tp.state = QEventPoint::State::Released;
         tpl.append(tp);
@@ -508,12 +508,12 @@ void QTuioHandler::process2DObjFseq(const QOscMessage &message)
     QList<QWindowSystemInterface::TouchPoint> tpl;
     tpl.reserve(m_activeTokens.size() + m_deadTokens.size());
 
-    for (const QTuioToken & t : qAsConst(m_activeTokens)) {
+    for (const QTuioToken & t : std::as_const(m_activeTokens)) {
         QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
         tpl.append(tp);
     }
 
-    for (const QTuioToken & t : qAsConst(m_deadTokens)) {
+    for (const QTuioToken & t : std::as_const(m_deadTokens)) {
         QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win);
         tp.state = QEventPoint::State::Released;
         tp.velocity = QVector2D();
diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp
index 7b2c2c0443..4c5c1946f6 100644
--- a/src/plugins/platforms/android/androidjniclipboard.cpp
+++ b/src/plugins/platforms/android/androidjniclipboard.cpp
@@ -49,7 +49,7 @@ namespace QtAndroidClipboard
         }
         if (data->hasUrls()) {
             QList<QUrl> urls = data->urls();
-            for (const auto &u : qAsConst(urls)) {
+            for (const auto &u : std::as_const(urls)) {
                 QJniObject::callStaticMethod<void>(applicationClass(),
                                                    "setClipboardUri",
                                                    "(Ljava/lang/String;)V",
diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index c7c03c6be6..7aaa5d921c 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -117,7 +117,7 @@ namespace QtAndroidMenu
 
         visibleMenuBar = 0;
         activeTopLevelWindow = window;
-        for (QAndroidPlatformMenuBar *menuBar : qAsConst(menuBars)) {
+        for (QAndroidPlatformMenuBar *menuBar : std::as_const(menuBars)) {
             if (menuBar->parentWindow() == window) {
                 visibleMenuBar = menuBar;
                 resetMenuBar();
@@ -318,7 +318,7 @@ namespace QtAndroidMenu
                 item->activated();
                 visibleMenu->aboutToHide();
                 visibleMenu = 0;
-                for (QAndroidPlatformMenu *menu : qAsConst(pendingContextMenus)) {
+                for (QAndroidPlatformMenu *menu : std::as_const(pendingContextMenus)) {
                     if (menu->isVisible())
                         menu->aboutToHide();
                 }
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.cpp b/src/plugins/platforms/android/qandroideventdispatcher.cpp
index e379dbcca9..8d1a085844 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.cpp
+++ b/src/plugins/platforms/android/qandroideventdispatcher.cpp
@@ -75,7 +75,7 @@ void QAndroidEventDispatcherStopper::startAll()
     if (!m_started.testAndSetOrdered(0, 1))
         return;
 
-    for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
+    for (QAndroidEventDispatcher *d : std::as_const(m_dispatchers))
         d->start();
 }
 
@@ -85,7 +85,7 @@ void QAndroidEventDispatcherStopper::stopAll()
     if (!m_started.testAndSetOrdered(1, 0))
         return;
 
-    for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
+    for (QAndroidEventDispatcher *d : std::as_const(m_dispatchers))
         d->stop();
 }
 
@@ -104,6 +104,6 @@ void QAndroidEventDispatcherStopper::removeEventDispatcher(QAndroidEventDispatch
 void QAndroidEventDispatcherStopper::goingToStop(bool stop)
 {
     QMutexLocker lock(&m_mutex);
-    for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
+    for (QAndroidEventDispatcher *d : std::as_const(m_dispatchers))
         d->goingToStop(stop);
 }
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp
index d11b7b197b..d2bb9f09f1 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.cpp
+++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp
@@ -312,7 +312,7 @@ void QAndroidPlatformScreen::setAvailableGeometry(const QRect &rect)
 
 void QAndroidPlatformScreen::applicationStateChanged(Qt::ApplicationState state)
 {
-    for (QAndroidPlatformWindow *w : qAsConst(m_windowStack))
+    for (QAndroidPlatformWindow *w : std::as_const(m_windowStack))
         w->applicationStateChanged(state);
 
     if (state <=  Qt::ApplicationHidden) {
@@ -353,7 +353,7 @@ void QAndroidPlatformScreen::doRedraw(QImage* screenGrabImage)
     // windows that have renderToTexture children (i.e. they need the OpenGL path) then
     // we do not need an overlay surface.
     bool hasVisibleRasterWindows = false;
-    for (QAndroidPlatformWindow *window : qAsConst(m_windowStack)) {
+    for (QAndroidPlatformWindow *window : std::as_const(m_windowStack)) {
         if (window->window()->isVisible() && window->isRaster() && !qt_window_private(window->window())->compositing) {
             hasVisibleRasterWindows = true;
             break;
@@ -408,7 +408,7 @@ void QAndroidPlatformScreen::doRedraw(QImage* screenGrabImage)
     compositePainter.setCompositionMode(QPainter::CompositionMode_Source);
 
     QRegion visibleRegion(m_dirtyRect);
-    for (QAndroidPlatformWindow *window : qAsConst(m_windowStack)) {
+    for (QAndroidPlatformWindow *window : std::as_const(m_windowStack)) {
         if (!window->window()->isVisible()
                 || qt_window_private(window->window())->compositing
                 || !window->isRaster())
diff --git a/src/plugins/platforms/bsdfb/qbsdfbscreen.cpp b/src/plugins/platforms/bsdfb/qbsdfbscreen.cpp
index 564e670290..31f8dab091 100644
--- a/src/plugins/platforms/bsdfb/qbsdfbscreen.cpp
+++ b/src/plugins/platforms/bsdfb/qbsdfbscreen.cpp
@@ -128,7 +128,7 @@ bool QBsdFbScreen::initialize()
     QRect userGeometry;
 
     // Parse arguments
-    for (const QString &arg : qAsConst(m_arguments)) {
+    for (const QString &arg : std::as_const(m_arguments)) {
         QRegularExpressionMatch match;
         if (arg.contains(mmSizeRx, &match))
             userMmSize = QSize(match.captured(1).toInt(), match.captured(2).toInt());
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm
index 21fae6de6f..b8f9a1aa8c 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenu.mm
@@ -37,7 +37,7 @@ QCocoaMenu::QCocoaMenu() :
 
 QCocoaMenu::~QCocoaMenu()
 {
-    for (auto *item : qAsConst(m_menuItems)) {
+    for (auto *item : std::as_const(m_menuItems)) {
         if (item->menuParent() == this)
             item->setMenuParent(nullptr);
     }
@@ -286,7 +286,7 @@ void QCocoaMenu::syncSeparatorsCollapsible(bool enable)
         if (lastVisibleItem && lastVisibleItem.separatorItem)
             lastVisibleItem.hidden = YES;
     } else {
-        for (auto *item : qAsConst(m_menuItems)) {
+        for (auto *item : std::as_const(m_menuItems)) {
             if (!item->isSeparator())
                 continue;
 
@@ -425,7 +425,7 @@ QPlatformMenuItem *QCocoaMenu::menuItemAt(int position) const
 
 QPlatformMenuItem *QCocoaMenu::menuItemForTag(quintptr tag) const
 {
-    for (auto *item : qAsConst(m_menuItems)) {
+    for (auto *item : std::as_const(m_menuItems)) {
         if (item->tag() ==  tag)
             return item;
     }
@@ -441,7 +441,7 @@ QList<QCocoaMenuItem *> QCocoaMenu::items() const
 QList<QCocoaMenuItem *> QCocoaMenu::merged() const
 {
     QList<QCocoaMenuItem *> result;
-    for (auto *item : qAsConst(m_menuItems)) {
+    for (auto *item : std::as_const(m_menuItems)) {
         if (item->menu()) { // recurse into submenus
             result.append(item->menu()->merged());
             continue;
@@ -462,7 +462,7 @@ void QCocoaMenu::propagateEnabledState(bool enabled)
     if (!m_enabled && enabled) // Some ancestor was enabled, but this menu is not
         return;
 
-    for (auto *item : qAsConst(m_menuItems)) {
+    for (auto *item : std::as_const(m_menuItems)) {
         if (QCocoaMenu *menu = item->menu())
             menu->propagateEnabledState(enabled);
         else
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm
index 7950fc3d66..60a25e732f 100644
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@@ -40,7 +40,7 @@ QCocoaMenuBar::~QCocoaMenuBar()
 #ifdef QT_COCOA_ENABLE_MENU_DEBUG
     qDebug() << "~QCocoaMenuBar" << this;
 #endif
-    for (auto menu : qAsConst(m_menus)) {
+    for (auto menu : std::as_const(m_menus)) {
         if (!menu)
             continue;
         NSMenuItem *item = nativeItemForMenu(menu);
@@ -241,7 +241,7 @@ QCocoaWindow *QCocoaMenuBar::findWindowForMenubar()
 
 QCocoaMenuBar *QCocoaMenuBar::findGlobalMenubar()
 {
-    for (auto *menubar : qAsConst(static_menubars)) {
+    for (auto *menubar : std::as_const(static_menubars)) {
         if (menubar->m_window.isNull())
             return menubar;
     }
@@ -282,7 +282,7 @@ void QCocoaMenuBar::updateMenuBarImmediately()
 #endif
     bool disableForModal = mb->shouldDisable(cw);
 
-    for (auto menu : qAsConst(mb->m_menus)) {
+    for (auto menu : std::as_const(mb->m_menus)) {
         if (!menu)
             continue;
         NSMenuItem *item = mb->nativeItemForMenu(menu);
@@ -345,7 +345,7 @@ void QCocoaMenuBar::insertWindowMenu()
 QList<QCocoaMenuItem*> QCocoaMenuBar::merged() const
 {
     QList<QCocoaMenuItem*> r;
-    for (auto menu : qAsConst(m_menus))
+    for (auto menu : std::as_const(m_menus))
         r.append(menu->merged());
 
     return r;
@@ -365,10 +365,10 @@ bool QCocoaMenuBar::shouldDisable(QCocoaWindow *active) const
     // When there is an application modal window on screen, the entries of
     // the menubar should be disabled. The exception in Qt is that if the
     // modal window is the only window on screen, then we enable the menu bar.
-    for (auto *window : qAsConst(topWindows)) {
+    for (auto *window : std::as_const(topWindows)) {
         if (window->isVisible() && window->modality() == Qt::ApplicationModal) {
             // check for other visible windows
-            for (auto *other : qAsConst(topWindows)) {
+            for (auto *other : std::as_const(topWindows)) {
                 if ((window != other) && (other->isVisible())) {
                     // INVARIANT: we found another visible window
                     // on screen other than our modalWidget. We therefore
@@ -389,7 +389,7 @@ bool QCocoaMenuBar::shouldDisable(QCocoaWindow *active) const
 
 QPlatformMenu *QCocoaMenuBar::menuForTag(quintptr tag) const
 {
-    for (auto menu : qAsConst(m_menus))
+    for (auto menu : std::as_const(m_menus))
         if (menu->tag() ==  tag)
             return menu;
 
@@ -398,7 +398,7 @@ QPlatformMenu *QCocoaMenuBar::menuForTag(quintptr tag) const
 
 NSMenuItem *QCocoaMenuBar::itemForRole(QPlatformMenuItem::MenuRole role)
 {
-    for (auto menu : qAsConst(m_menus))
+    for (auto menu : std::as_const(m_menus))
         for (auto *item : menu->items())
             if (item->effectiveRole() == role)
                 return item->nsItem();
@@ -419,7 +419,7 @@ void QCocoaMenuBar::insertDefaultEditItems(QCocoaMenu *menu)
     NSMenu *nsEditMenu = menu->nsMenu();
     if ([nsEditMenu itemAtIndex:nsEditMenu.numberOfItems - 1].action
         == @selector(orderFrontCharacterPalette:)) {
-        for (auto defaultEditMenuItem : qAsConst(m_defaultEditMenuItems)) {
+        for (auto defaultEditMenuItem : std::as_const(m_defaultEditMenuItems)) {
             if (menu->items().contains(defaultEditMenuItem))
                 menu->removeMenuItem(defaultEditMenuItem);
         }
@@ -445,7 +445,7 @@ void QCocoaMenuBar::insertDefaultEditItems(QCocoaMenu *menu)
 
             m_defaultEditMenuItems << separator << dictationItem << emojiItem;
         }
-        for (auto defaultEditMenuItem : qAsConst(m_defaultEditMenuItems)) {
+        for (auto defaultEditMenuItem : std::as_const(m_defaultEditMenuItems)) {
             if (menu->items().contains(defaultEditMenuItem))
                 menu->removeMenuItem(defaultEditMenuItem);
             menu->insertMenuItem(defaultEditMenuItem, nullptr);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index bed06dc62d..bc304f78be 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -1651,7 +1651,7 @@ void QWindowsDirect2DPaintEngine::rasterFill(const QVectorPath &path, const QBru
         p.setPen(state()->pen);
 
         auto *extended = static_cast<QPaintEngineEx *>(engine);
-        for (const QPainterClipInfo &info : qAsConst(state()->clipInfo)) {
+        for (const QPainterClipInfo &info : std::as_const(state()->clipInfo)) {
             extended->state()->matrix = info.matrix;
             extended->transformChanged();
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
index 5ac28315ff..dedb898b80 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
@@ -410,7 +410,7 @@ void QEglFSKmsGbmScreen::updateFlipStatus()
     if (m_flipPending)
         return;
 
-    for (const CloneDestination &d : qAsConst(m_cloneDests)) {
+    for (const CloneDestination &d : std::as_const(m_cloneDests)) {
         if (d.cloneFlipPending)
             return;
     }
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp
index cc52d371e3..369356b761 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp
@@ -185,7 +185,7 @@ QList<QPlatformScreen::Mode> QEglFSKmsScreen::modes() const
     QList<QPlatformScreen::Mode> list;
     list.reserve(m_output.modes.size());
 
-    for (const drmModeModeInfo &info : qAsConst(m_output.modes))
+    for (const drmModeModeInfo &info : std::as_const(m_output.modes))
         list.append({QSize(info.hdisplay, info.vdisplay),
                      qreal(info.vrefresh > 0 ? info.vrefresh : 60)});
 
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.cpp
index 40cdd78e56..e7e3c76190 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qvsp2blendingdevice.cpp
@@ -205,7 +205,7 @@ bool QVsp2BlendingDevice::blend(int outputDmabufFd)
 
     if (queueingFailed) {
         qWarning() << "Vsp2: Trying to clean up queued buffers";
-        for (auto &input : qAsConst(m_inputs)) {
+        for (auto &input : std::as_const(m_inputs)) {
             if (input.enabled) {
                 if (!input.rpfInput->clearBuffers())
                     qWarning() << "Vsp2: Failed to remove buffers after an aborted blend";
@@ -248,7 +248,7 @@ int QVsp2BlendingDevice::numInputs() const
 bool QVsp2BlendingDevice::hasContinuousLayers() const
 {
     bool seenDisabled = false;
-    for (auto &input : qAsConst(m_inputs)) {
+    for (auto &input : std::as_const(m_inputs)) {
         if (seenDisabled && input.enabled)
             return false;
         seenDisabled |= !input.enabled;
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
index 076cf49ba7..9cb232e13d 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp
@@ -408,7 +408,7 @@ QRegion QLinuxFbDrmScreen::doRedraw()
     // Image has alpha but no need for blending at this stage.
     // Do not waste time with the default SourceOver.
     pntr.setCompositionMode(QPainter::CompositionMode_Source);
-    for (const QRect &rect : qAsConst(output->dirty[output->backFb]))
+    for (const QRect &rect : std::as_const(output->dirty[output->backFb]))
         pntr.drawImage(rect, mScreenImage, rect);
     pntr.end();
 
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
index 24cab2ee23..e2826f3946 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
@@ -286,7 +286,7 @@ bool QLinuxFbScreen::initialize()
     bool doSwitchToGraphicsMode = true;
 
     // Parse arguments
-    for (const QString &arg : qAsConst(mArgs)) {
+    for (const QString &arg : std::as_const(mArgs)) {
         QRegularExpressionMatch match;
         if (arg == "nographicsmodeswitch"_L1)
             doSwitchToGraphicsMode = false;
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
index 9152795e9f..923fffb29c 100644
--- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
@@ -195,7 +195,7 @@ QOffscreenBackingStore *QOffscreenBackingStore::backingStoreForWinId(WId id)
 void QOffscreenBackingStore::clearHash()
 {
     for (auto it = m_windowAreaHash.cbegin(), end = m_windowAreaHash.cend(); it != end; ++it) {
-        const auto it2 = qAsConst(m_backingStoreForWinIdHash).find(it.key());
+        const auto it2 = std::as_const(m_backingStoreForWinIdHash).find(it.key());
         if (it2.value() == this)
             m_backingStoreForWinIdHash.erase(it2);
     }
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index ed9ad6ccbc..ff6ce05aaa 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -571,7 +571,7 @@ QList<screen_display_t *> QQnxIntegration::sortDisplays(screen_display_t *availa
 
     // Go through all the requested displays IDs
     QList<screen_display_t *> orderedDisplays;
-    for (const QJsonValue &value : qAsConst(requestedDisplays)) {
+    for (const QJsonValue &value : std::as_const(requestedDisplays)) {
         int requestedValue = value.toInt();
 
         // Move all displays with matching ID from the intermediate list
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index ee68bee6e3..99e80e5801 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -567,7 +567,7 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
         cursor = *platformImage.image();
         hotspot = platformImage.hotspot();
     }
-    for (auto client : qAsConst(clients))
+    for (auto client : std::as_const(clients))
         client->setDirtyCursor();
 }
 
@@ -613,7 +613,7 @@ QVncServer::~QVncServer()
 
 void QVncServer::setDirty()
 {
-    for (auto client : qAsConst(clients))
+    for (auto client : std::as_const(clients))
         client->setDirty(qvnc_screen->dirtyRegion);
 
     qvnc_screen->clearDirty();
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index c67e5a0073..c87df20ef6 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -41,7 +41,7 @@ bool QVncScreen::initialize()
     mDepth = 32;
     mPhysicalSize = QSizeF(mGeometry.width()/96.*25.4, mGeometry.height()/96.*25.4);
 
-    for (const QString &arg : qAsConst(mArgs)) {
+    for (const QString &arg : std::as_const(mArgs)) {
         QRegularExpressionMatch match;
         if (arg.contains(mmSizeRx, &match)) {
             mPhysicalSize = QSizeF(match.captured("width").toDouble(), match.captured("height").toDouble());
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index c95f2ef272..fd3cd94a13 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -264,7 +264,7 @@ void QWindowsContext::registerTouchWindows()
 {
     if (QGuiApplicationPrivate::is_app_running
         && (d->m_systemInfo & QWindowsContext::SI_SupportsTouch) != 0) {
-        for (QWindowsWindow *w : qAsConst(d->m_windows))
+        for (QWindowsWindow *w : std::as_const(d->m_windows))
             w->registerTouchWindow();
     }
 }
@@ -601,7 +601,7 @@ void QWindowsContext::unregisterWindowClasses()
 {
     const auto appInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
 
-    for (const QString &name : qAsConst(d->m_registeredWindowClassNames)) {
+    for (const QString &name : std::as_const(d->m_registeredWindowClassNames)) {
         if (!UnregisterClass(reinterpret_cast<LPCWSTR>(name.utf16()), appInstance) && QWindowsContext::verbose)
             qErrnoWarning("UnregisterClass failed for '%s'", qPrintable(name));
     }
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index d851964b9d..ef278aa2fd 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1355,7 +1355,7 @@ Q_GLOBAL_STATIC(QStringList, temporaryItemCopies)
 
 static void cleanupTemporaryItemCopies()
 {
-    for (const QString &file : qAsConst(*temporaryItemCopies()))
+    for (const QString &file : std::as_const(*temporaryItemCopies()))
         QFile::remove(file);
 }
 
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
index 4aa5246a00..488d5f89b5 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
@@ -524,7 +524,7 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
 
     // Some devices send touches for each finger in a different message/frame, instead of consolidating
     // them in the same frame as we were expecting. We account for missing unreleased touches here.
-    for (auto tp : qAsConst(m_lastTouchPoints)) {
+    for (auto tp : std::as_const(m_lastTouchPoints)) {
         if (!inputIds.contains(tp.id)) {
             tp.state = QEventPoint::State::Stationary;
             allStates |= tp.state;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 395e1b0586..48b5dc90ee 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -713,7 +713,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
 #ifndef QT_NO_CLIPBOARD
         m_clipboard->handleXFixesSelectionRequest(notify_event);
 #endif
-        for (QXcbVirtualDesktop *virtualDesktop : qAsConst(m_virtualDesktops))
+        for (QXcbVirtualDesktop *virtualDesktop : std::as_const(m_virtualDesktops))
             virtualDesktop->handleXFixesSelectionNotify(notify_event);
     } else if (isXRandrType(response_type, XCB_RANDR_NOTIFY)) {
         if (!isAtLeastXRandR15())
diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
index 2d62b9e99b..4c1b22e230 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
@@ -155,7 +155,7 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event)
             }
         }
 
-        qCDebug(lcQpaScreen) << "updateScreens: primary output is" << qAsConst(m_screens).first()->name();
+        qCDebug(lcQpaScreen) << "updateScreens: primary output is" << std::as_const(m_screens).first()->name();
     }
 }
 
@@ -184,7 +184,7 @@ void QXcbConnection::updateScreen(QXcbScreen *screen, const xcb_randr_output_cha
             // If the screen became primary, reshuffle the order in QGuiApplicationPrivate
             const int idx = m_screens.indexOf(screen);
             if (idx > 0) {
-                qAsConst(m_screens).first()->setPrimary(false);
+                std::as_const(m_screens).first()->setPrimary(false);
                 m_screens.swapItemsAt(0, idx);
             }
             screen->virtualDesktop()->setPrimaryScreen(screen);
@@ -204,7 +204,7 @@ QXcbScreen *QXcbConnection::createScreen(QXcbVirtualDesktop *virtualDesktop,
 
     if (screen->isPrimary()) {
         if (!m_screens.isEmpty())
-            qAsConst(m_screens).first()->setPrimary(false);
+            std::as_const(m_screens).first()->setPrimary(false);
 
         m_screens.prepend(screen);
     } else {
@@ -253,7 +253,7 @@ void QXcbConnection::updateScreen_monitor(QXcbScreen *screen, xcb_randr_monitor_
     if (screen->isPrimary()) {
         const int idx = m_screens.indexOf(screen);
         if (idx > 0) {
-            qAsConst(m_screens).first()->setPrimary(false);
+            std::as_const(m_screens).first()->setPrimary(false);
             m_screens.swapItemsAt(0, idx);
         }
         screen->virtualDesktop()->setPrimaryScreen(screen);
@@ -268,7 +268,7 @@ QXcbScreen *QXcbConnection::createScreen_monitor(QXcbVirtualDesktop *virtualDesk
 
     if (screen->isPrimary()) {
         if (!m_screens.isEmpty())
-            qAsConst(m_screens).first()->setPrimary(false);
+            std::as_const(m_screens).first()->setPrimary(false);
 
         m_screens.prepend(screen);
     } else {
@@ -326,7 +326,7 @@ void QXcbConnection::initializeScreens(bool initialized)
         ++xcbScreenNumber;
     }
 
-    for (QXcbVirtualDesktop *virtualDesktop : qAsConst(m_virtualDesktops))
+    for (QXcbVirtualDesktop *virtualDesktop : std::as_const(m_virtualDesktops))
         virtualDesktop->subscribeToXFixesSelectionNotify();
 
     if (m_virtualDesktops.isEmpty()) {
@@ -334,7 +334,7 @@ void QXcbConnection::initializeScreens(bool initialized)
     } else {
         // Ensure the primary screen is first on the list
         if (primaryScreen) {
-            if (qAsConst(m_screens).first() != primaryScreen) {
+            if (std::as_const(m_screens).first() != primaryScreen) {
                 m_screens.removeOne(primaryScreen);
                 m_screens.prepend(primaryScreen);
             }
@@ -342,14 +342,14 @@ void QXcbConnection::initializeScreens(bool initialized)
 
         // Push the screens to QGuiApplication
         if (!initialized) {
-            for (QXcbScreen *screen : qAsConst(m_screens)) {
+            for (QXcbScreen *screen : std::as_const(m_screens)) {
                 qCDebug(lcQpaScreen) << "adding" << screen << "(Primary:" << screen->isPrimary() << ")";
                 QWindowSystemInterface::handleScreenAdded(screen, screen->isPrimary());
             }
         }
 
         if (!m_screens.isEmpty())
-            qCDebug(lcQpaScreen) << "initializeScreens: primary output is" << qAsConst(m_screens).first()->name();
+            qCDebug(lcQpaScreen) << "initializeScreens: primary output is" << std::as_const(m_screens).first()->name();
     }
 }
 
diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
index 6f732b57a0..03e758bf85 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@@ -792,7 +792,7 @@ void QXcbConnection::xi2ProcessTouch(void *xiDevEvent, QXcbWindow *platformWindo
     qreal nx = -1.0, ny = -1.0;
     qreal w = 0.0, h = 0.0;
     bool majorAxisIsY = touchPoint.area.height() > touchPoint.area.width();
-    for (const TouchDeviceData::ValuatorClassInfo &vci : qAsConst(dev->valuatorInfo)) {
+    for (const TouchDeviceData::ValuatorClassInfo &vci : std::as_const(dev->valuatorInfo)) {
         double value;
         if (!xi2GetValuatorValueIfSet(xiDeviceEvent, vci.number, &value))
             continue;
@@ -1023,7 +1023,7 @@ bool QXcbConnection::xi2SetMouseGrabEnabled(xcb_window_t w, bool grab)
         }
 #endif // QT_CONFIG(gestures) && QT_XCB_HAS_TOUCHPAD_GESTURES
 
-        for (int id : qAsConst(m_xiMasterPointerIds)) {
+        for (int id : std::as_const(m_xiMasterPointerIds)) {
             xcb_generic_error_t *error = nullptr;
             auto cookie = xcb_input_xi_grab_device(xcb_connection(), w, XCB_CURRENT_TIME, XCB_CURSOR_NONE, id,
                                                    XCB_INPUT_GRAB_MODE_22_ASYNC, XCB_INPUT_GRAB_MODE_22_ASYNC,
@@ -1041,7 +1041,7 @@ bool QXcbConnection::xi2SetMouseGrabEnabled(xcb_window_t w, bool grab)
             free(reply);
         }
     } else { // ungrab
-        for (int id : qAsConst(m_xiMasterPointerIds)) {
+        for (int id : std::as_const(m_xiMasterPointerIds)) {
             auto cookie = xcb_input_xi_ungrab_device_checked(xcb_connection(), XCB_CURRENT_TIME, id);
             xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
             if (error) {
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index 7db1ee1c1b..6e847ceeec 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -280,7 +280,7 @@ QXcbCursor::~QXcbCursor()
         xcb_close_font(conn, cursorFont);
 
 #ifndef QT_NO_CURSOR
-    for (xcb_cursor_t cursor : qAsConst(m_cursorHash))
+    for (xcb_cursor_t cursor : std::as_const(m_cursorHash))
         xcb_free_cursor(conn, cursor);
 #endif
 
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 30746148bc..1192af1469 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -92,7 +92,7 @@ QXcbVirtualDesktop::~QXcbVirtualDesktop()
 {
     delete m_xSettings;
 
-    for (auto cmap : qAsConst(m_visualColormaps))
+    for (auto cmap : std::as_const(m_visualColormaps))
         xcb_free_colormap(xcb_connection(), cmap);
 }
 
@@ -222,7 +222,7 @@ void QXcbVirtualDesktop::handleScreenChange(xcb_randr_screen_change_notify_event
     case XCB_RANDR_ROTATION_REFLECT_Y: break;
     }
 
-    for (QPlatformScreen *platformScreen : qAsConst(m_screens)) {
+    for (QPlatformScreen *platformScreen : std::as_const(m_screens)) {
         QDpi ldpi = platformScreen->logicalDpi();
         QWindowSystemInterface::handleScreenLogicalDotsPerInchChange(platformScreen->screen(), ldpi.first, ldpi.second);
     }
@@ -271,7 +271,7 @@ void QXcbVirtualDesktop::updateWorkArea()
     QRect workArea = getWorkArea();
     if (m_workArea != workArea) {
         m_workArea = workArea;
-        for (QPlatformScreen *screen : qAsConst(m_screens))
+        for (QPlatformScreen *screen : std::as_const(m_screens))
             ((QXcbScreen *)screen)->updateAvailableGeometry();
     }
 }
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
index a25a630ffc..c7b7ec550f 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
@@ -75,7 +75,7 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     QStringList themeNames;
     themeNames += QGuiApplicationPrivate::platform_integration->themeNames();
     // 1) Look for a theme plugin.
-    for (const QString &themeName : qAsConst(themeNames)) {
+    for (const QString &themeName : std::as_const(themeNames)) {
         d->baseTheme = QPlatformThemeFactory::create(themeName, nullptr);
         if (d->baseTheme)
             break;
@@ -84,7 +84,7 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     // 2) If no theme plugin was found ask the platform integration to
     // create a theme
     if (!d->baseTheme) {
-        for (const QString &themeName : qAsConst(themeNames)) {
+        for (const QString &themeName : std::as_const(themeNames)) {
             d->baseTheme = QGuiApplicationPrivate::platform_integration->createPlatformTheme(themeName);
             if (d->baseTheme)
                 break;
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
index e944d11a0c..301e45d2c9 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
@@ -776,7 +776,7 @@ void QSQLiteDriver::close()
 {
     Q_D(QSQLiteDriver);
     if (isOpen()) {
-        for (QSQLiteResult *result : qAsConst(d->results))
+        for (QSQLiteResult *result : std::as_const(d->results))
             result->d_func()->finalize();
 
         if (d->access && (d->notificationid.count() > 0)) {
diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp
index 5acdb07520..ef625c6eb5 100644
--- a/src/plugins/styles/android/qandroidstyle.cpp
+++ b/src/plugins/styles/android/qandroidstyle.cpp
@@ -1134,7 +1134,7 @@ QAndroidStyle::AndroidStateDrawable::AndroidStateDrawable(const QVariantMap &dra
 
 QAndroidStyle::AndroidStateDrawable::~AndroidStateDrawable()
 {
-    for (const StateType &type : qAsConst(m_states))
+    for (const StateType &type : std::as_const(m_states))
         delete type.second;
 }
 
@@ -1259,7 +1259,7 @@ int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
 
 void QAndroidStyle::AndroidStateDrawable::setPaddingLeftToSizeWidth()
 {
-    for (const StateType &type : qAsConst(m_states))
+    for (const StateType &type : std::as_const(m_states))
         const_cast<AndroidDrawable *>(type.second)->setPaddingLeftToSizeWidth();
 }
 
@@ -1285,7 +1285,7 @@ QAndroidStyle::AndroidLayerDrawable::AndroidLayerDrawable(const QVariantMap &dra
 
 QAndroidStyle::AndroidLayerDrawable::~AndroidLayerDrawable()
 {
-    for (const LayerType &layer : qAsConst(m_layers))
+    for (const LayerType &layer : std::as_const(m_layers))
         delete layer.second;
 }
 
diff --git a/src/plugins/tls/openssl/qdtls_openssl.cpp b/src/plugins/tls/openssl/qdtls_openssl.cpp
index 0cb4d0b831..9531d5b6aa 100644
--- a/src/plugins/tls/openssl/qdtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qdtls_openssl.cpp
@@ -1328,7 +1328,7 @@ bool QDtlsPrivateOpenSSL::verifyPeer()
     // Translate errors from the error list into QSslErrors
     using CertClass = QTlsPrivate::X509CertificateOpenSSL;
     errors.reserve(errors.size() + opensslErrors.size());
-    for (const auto &error : qAsConst(opensslErrors)) {
+    for (const auto &error : std::as_const(opensslErrors)) {
         const auto value = peerCertificateChain.value(error.depth);
         errors << CertClass::openSSLErrorToQSslError(error.code, value);
     }
diff --git a/src/plugins/tls/openssl/qsslcontext_openssl.cpp b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
index e2b89d8805..ef0e63911a 100644
--- a/src/plugins/tls/openssl/qsslcontext_openssl.cpp
+++ b/src/plugins/tls/openssl/qsslcontext_openssl.cpp
@@ -632,7 +632,7 @@ QT_WARNING_POP
 
         // If we have any intermediate certificates then we need to add them to our chain
         bool first = true;
-        for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) {
+        for (const QSslCertificate &cert : std::as_const(configuration.d->localCertificateChain)) {
             if (first) {
                 first = false;
                 continue;
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
index 70506ae412..23be899dee 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
@@ -621,7 +621,7 @@ static QStringList findAllLibs(QLatin1StringView filter)
         QStringList entryList = dir.entryList(filters, QDir::Files);
 
         std::sort(entryList.begin(), entryList.end(), LibGreaterThan());
-        for (const QString &entry : qAsConst(entryList))
+        for (const QString &entry : std::as_const(entryList))
             found << path + u'/' + entry;
     }
 
diff --git a/src/plugins/tls/openssl/qtls_openssl.cpp b/src/plugins/tls/openssl/qtls_openssl.cpp
index a78bdca53f..53380a9824 100644
--- a/src/plugins/tls/openssl/qtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qtls_openssl.cpp
@@ -577,7 +577,7 @@ bool TlsCryptographOpenSSL::startHandshake()
     auto configuration = q->sslConfiguration();
     if (!errorsReportedFromCallback) {
         const auto &peerCertificateChain = configuration.peerCertificateChain();
-        for (const auto &currentError : qAsConst(lastErrors)) {
+        for (const auto &currentError : std::as_const(lastErrors)) {
             emit q->peerVerifyError(QTlsPrivate::X509CertificateOpenSSL::openSSLErrorToQSslError(currentError.code,
                                     peerCertificateChain.value(currentError.depth)));
             if (q->state() != QAbstractSocket::ConnectedState)
@@ -697,7 +697,7 @@ bool TlsCryptographOpenSSL::startHandshake()
 
     // Translate errors from the error list into QSslErrors.
     errors.reserve(errors.size() + errorList.size());
-    for (const auto &error : qAsConst(errorList))
+    for (const auto &error : std::as_const(errorList))
         errors << X509CertificateOpenSSL::openSSLErrorToQSslError(error.code, peerCertificateChain.value(error.depth));
 
     if (!errors.isEmpty()) {
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
index dfd48e01af..f8c146372a 100644
--- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
@@ -392,7 +392,7 @@ QList<QSslCertificate> systemCaCertificates()
                 certFiles.insert(it.nextFileInfo().canonicalFilePath());
             }
         }
-        for (const QString& file : qAsConst(certFiles))
+        for (const QString& file : std::as_const(certFiles))
             systemCerts.append(QSslCertificate::fromPath(file, QSsl::Pem));
     }
 #endif // platform
diff --git a/src/plugins/tls/openssl/qx509_openssl.cpp b/src/plugins/tls/openssl/qx509_openssl.cpp
index 0d911d086d..8a9f61f4c7 100644
--- a/src/plugins/tls/openssl/qx509_openssl.cpp
+++ b/src/plugins/tls/openssl/qx509_openssl.cpp
@@ -710,7 +710,7 @@ QList<QSslError> X509CertificateOpenSSL::verify(const QList<QSslCertificate> &ca
 
     // Translate errors from the error list into QSslErrors.
     errors.reserve(errors.size() + lastErrors.size());
-    for (const auto &error : qAsConst(lastErrors))
+    for (const auto &error : std::as_const(lastErrors))
         errors << openSSLErrorToQSslError(error.code, certificateChain.value(error.depth));
 
     return errors;
diff --git a/src/plugins/tls/securetransport/qtls_st.cpp b/src/plugins/tls/securetransport/qtls_st.cpp
index 39e2671692..5306cad71d 100644
--- a/src/plugins/tls/securetransport/qtls_st.cpp
+++ b/src/plugins/tls/securetransport/qtls_st.cpp
@@ -1075,7 +1075,7 @@ bool TlsCryptographSecureTransport::verifyPeerTrust()
         QTlsBackend::storePeerCertificate(d, peerCertificateChain.at(0));
 
     // Check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer):
-    for (const QSslCertificate &cert : qAsConst(peerCertificateChain)) {
+    for (const QSslCertificate &cert : std::as_const(peerCertificateChain)) {
         if (QSslCertificatePrivate::isBlacklisted(cert) && !canIgnoreVerify) {
             const QSslError error(QSslError::CertificateBlacklisted, cert);
             errors << error;
diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index ac8628685d..0ea0242edd 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -127,7 +127,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con
     // e.g. Windows defines DMPAPER_11X17 and DMPAPER_TABLOID with names "11x17" and "Tabloid", but both
     // map to QPageSize::Tabloid / PPD Key "Tabloid" / ANSI B Tabloid
     if (pageSize.id() != QPageSize::Custom) {
-        for (const QPageSize &ps : qAsConst(m_pageSizes)) {
+        for (const QPageSize &ps : std::as_const(m_pageSizes)) {
             if (ps.id() == pageSize.id() && ps.name() == pageSize.name())
                 return ps;
         }
@@ -135,7 +135,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con
 
     // Next try match on id only if not custom
     if (pageSize.id() != QPageSize::Custom) {
-        for (const QPageSize &ps : qAsConst(m_pageSizes)) {
+        for (const QPageSize &ps : std::as_const(m_pageSizes)) {
             if (ps.id() == pageSize.id())
                 return ps;
         }
@@ -150,7 +150,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(QPageSize::PageSizeId pageSize
     if (!m_havePageSizes)
         loadPageSizes();
 
-    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
+    for (const QPageSize &ps : std::as_const(m_pageSizes)) {
         if (ps.id() == pageSizeId)
             return ps;
     }
@@ -164,7 +164,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QString &pageName) const
     if (!m_havePageSizes)
         loadPageSizes();
 
-    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
+    for (const QPageSize &ps : std::as_const(m_pageSizes)) {
         if (ps.name() == pageName)
             return ps;
     }
@@ -197,7 +197,7 @@ QPageSize QPlatformPrintDevice::supportedPageSizeMatch(const QPageSize &pageSize
         return pageSize;
 
     // Try to find a supported page size based on point size
-    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
+    for (const QPageSize &ps : std::as_const(m_pageSizes)) {
         if (ps.sizePoints() == pageSize.sizePoints())
             return ps;
     }
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp
index 247fbf9601..fa33cf66b8 100644
--- a/src/printsupport/widgets/qprintpreviewwidget.cpp
+++ b/src/printsupport/widgets/qprintpreviewwidget.cpp
@@ -296,7 +296,7 @@ void QPrintPreviewWidgetPrivate::init()
 void QPrintPreviewWidgetPrivate::populateScene()
 {
     // remove old pages
-    for (auto *page : qAsConst(pages))
+    for (auto *page : std::as_const(pages))
         scene->removeItem(page);
     qDeleteAll(pages);
     pages.clear();
@@ -305,7 +305,7 @@ void QPrintPreviewWidgetPrivate::populateScene()
     QRect pageRect = printer->pageLayout().paintRectPixels(printer->resolution());
 
     int page = 1;
-    for (auto *picture : qAsConst(pictures)) {
+    for (auto *picture : std::as_const(pictures)) {
         PageItem* item = new PageItem(page++, picture, paperSize, pageRect);
         scene->addItem(item);
         pages.append(item);
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index 5db348fd22..a9b237bd5d 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -115,7 +115,7 @@ public:
         return res;
     }
     static bool containsEvent(QAccessibleEvent *event) {
-        for (const QAccessibleEvent *ev : qAsConst(eventList())) {
+        for (const QAccessibleEvent *ev : std::as_const(eventList())) {
             if (*ev == *event)
                 return true;
         }
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index d9ffefa775..d3858267bc 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2319,7 +2319,7 @@ int QTest::qRun()
         bool seenBad = false;
         TestMethods::MetaMethods commandLineMethods;
         commandLineMethods.reserve(static_cast<size_t>(QTest::testFunctions.size()));
-        for (const QString &tf : qAsConst(QTest::testFunctions)) {
+        for (const QString &tf : std::as_const(QTest::testFunctions)) {
             const QByteArray tfB = tf.toLatin1();
             const QByteArray signature = tfB + QByteArrayLiteral("()");
             QMetaMethod m = TestMethods::findMethod(currentTestObject, signature.constData());
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 9867e8c5b2..44480cbc04 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -70,7 +70,7 @@ static void saveCoverageTool(const char * appname, bool testfailed, bool install
 Q_CONSTINIT static QElapsedTimer elapsedFunctionTime;
 Q_CONSTINIT static QElapsedTimer elapsedTotalTime;
 
-#define FOREACH_TEST_LOGGER for (const auto &logger : qAsConst(*QTest::loggers()))
+#define FOREACH_TEST_LOGGER for (const auto &logger : std::as_const(*QTest::loggers()))
 
 namespace QTest {
 
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 46f5c76ed9..61d58704fc 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1589,12 +1589,12 @@ bool updateAndroidManifest(Options &options)
     replacements[QStringLiteral("package=\"org.qtproject.example\"")] = "package=\"%1\""_L1.arg(options.packageName);
 
     QString permissions;
-    for (const QString &permission : qAsConst(options.permissions))
+    for (const QString &permission : std::as_const(options.permissions))
         permissions += "    <uses-permission android:name=\"%1\" />\n"_L1.arg(permission);
     replacements[QStringLiteral("<!-- %%INSERT_PERMISSIONS -->")] = permissions.trimmed();
 
     QString features;
-    for (const QString &feature : qAsConst(options.features))
+    for (const QString &feature : std::as_const(options.features))
         features += "    <uses-feature android:name=\"%1\" android:required=\"false\" />\n"_L1.arg(feature);
     if (options.usesOpenGL)
         features += "    <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />"_L1;
@@ -1915,7 +1915,7 @@ bool readDependenciesFromElf(Options *options,
         dependenciesToCheck.append(dependency);
     }
 
-    for (const QString &dependency : qAsConst(dependenciesToCheck)) {
+    for (const QString &dependency : std::as_const(dependenciesToCheck)) {
         QString qtBaseName = dependency.mid(sizeof("lib/lib") - 1);
         qtBaseName = qtBaseName.left(qtBaseName.size() - (sizeof(".so") - 1));
         if (!readAndroidDependencyXml(options, qtBaseName, usedDependencies, remainingDependencies)) {
@@ -1960,7 +1960,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
             importPaths += shellQuote(prefix + "/qml"_L1);
 
     // These are provided by both CMake and qmake.
-    for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) {
+    for (const QString &qmlImportPath : std::as_const(options->qmlImportPaths)) {
         if (QFile::exists(qmlImportPath)) {
             importPaths += shellQuote(qmlImportPath);
         } else {
@@ -2075,7 +2075,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
             }
 
             QString importPathOfThisImport;
-            for (const QString &importPath : qAsConst(importPaths)) {
+            for (const QString &importPath : std::as_const(importPaths)) {
 #if defined(Q_OS_WIN32)
                 Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive;
 #else
@@ -2399,7 +2399,7 @@ bool copyQtFiles(Options *options)
 
     // Copy other Qt dependencies
     auto assetsDestinationDirectory = "assets/android_rcc_bundle/"_L1;
-    for (const QtDependency &qtDependency : qAsConst(options->qtDependencies[options->currentArchitecture])) {
+    for (const QtDependency &qtDependency : std::as_const(options->qtDependencies[options->currentArchitecture])) {
         QString sourceFileName = qtDependency.absolutePath;
         QString destinationFileName;
         bool isSharedLibrary = qtDependency.relativePath.endsWith(".so"_L1);
diff --git a/src/tools/moc/collectjson.cpp b/src/tools/moc/collectjson.cpp
index c0a4b64d7e..d542e2abc4 100644
--- a/src/tools/moc/collectjson.cpp
+++ b/src/tools/moc/collectjson.cpp
@@ -60,7 +60,7 @@ int collectJson(const QStringList &jsonFiles, const QString &outputFile, bool sk
 
     QStringList jsonFilesSorted = jsonFiles;
     jsonFilesSorted.sort();
-    for (const QString &jsonFile : qAsConst(jsonFilesSorted)) {
+    for (const QString &jsonFile : std::as_const(jsonFilesSorted)) {
         QFile f(jsonFile);
         if (!f.open(QIODevice::ReadOnly)) {
             fprintf(stderr, "Error opening %s for reading\n", qPrintable(jsonFile));
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 13973645a1..d111380b8f 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -318,7 +318,7 @@ void Generator::generateCode()
 //
 // Build stringdata arrays
 //
-    for (const QByteArray &s : qAsConst(strings)) {
+    for (const QByteArray &s : std::as_const(strings)) {
         fputc(',', out);
         printStringWithIndentation(out, s);
     }
@@ -667,7 +667,7 @@ void Generator::generateCode()
         fprintf(out, "//     a) You are using a NOTIFY signal that does not exist. Fix it.\n");
         fprintf(out, "//     b) You are using a NOTIFY signal that does exist (in a parent class) but has a non-empty parameter list. This is a moc limitation.\n");
         fprintf(out, "[[maybe_unused]] static void checkNotifySignalValidity_%s(%s *t) {\n", qualifiedClassNameIdentifier.constData(), cdef->qualified.constData());
-        for (const QByteArray &nonClassSignal : qAsConst(cdef->nonClassSignalList))
+        for (const QByteArray &nonClassSignal : std::as_const(cdef->nonClassSignalList))
             fprintf(out, "    t->%s();\n", nonClassSignal.constData());
         fprintf(out, "}\n");
     }
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index a74dc246d7..9c18c3a862 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -968,7 +968,7 @@ void Moc::parse()
             classHash.insert(def.qualified, def.qualified);
         }
     }
-    for (const auto &n : qAsConst(namespaceList)) {
+    for (const auto &n : std::as_const(namespaceList)) {
         if (!n.hasQNamespace)
             continue;
         ClassDef def;
@@ -1143,7 +1143,7 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
 
         QJsonArray classesJsonFormatted;
 
-        for (const ClassDef &cdef: qAsConst(classList))
+        for (const ClassDef &cdef: std::as_const(classList))
             classesJsonFormatted.append(cdef.toJson());
 
         if (!classesJsonFormatted.isEmpty())
@@ -1923,7 +1923,7 @@ QJsonObject ClassDef::toJson() const
     cls["qualifiedClassName"_L1] = QString::fromUtf8(qualified.constData());
 
     QJsonArray classInfos;
-    for (const auto &info: qAsConst(classInfoList)) {
+    for (const auto &info: std::as_const(classInfoList)) {
         QJsonObject infoJson;
         infoJson["name"_L1] = QString::fromUtf8(info.name);
         infoJson["value"_L1] = QString::fromUtf8(info.value);
@@ -1950,7 +1950,7 @@ QJsonObject ClassDef::toJson() const
 
     QJsonArray props;
 
-    for (const PropertyDef &propDef: qAsConst(propertyList))
+    for (const PropertyDef &propDef: std::as_const(propertyList))
         props.append(propDef.toJson());
 
     if (!props.isEmpty())
@@ -1965,7 +1965,7 @@ QJsonObject ClassDef::toJson() const
 
     QJsonArray superClasses;
 
-    for (const auto &super: qAsConst(superclassList)) {
+    for (const auto &super: std::as_const(superclassList)) {
         const auto name = super.first;
         const auto access = super.second;
         QJsonObject superCls;
@@ -1978,7 +1978,7 @@ QJsonObject ClassDef::toJson() const
         cls["superClasses"_L1] = superClasses;
 
     QJsonArray enums;
-    for (const EnumDef &enumDef: qAsConst(enumList))
+    for (const EnumDef &enumDef: std::as_const(enumList))
         enums.append(enumDef.toJson(*this));
     if (!enums.isEmpty())
         cls["enums"_L1] = enums;
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index c5511af734..08e3fcf066 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -476,7 +476,7 @@ int main(int argc, char **argv)
 
     output.write(docTypeHeader);
     output.write("<node>\n");
-    for (const ClassDef &cdef : qAsConst(classes)) {
+    for (const ClassDef &cdef : std::as_const(classes)) {
         QString xml = qDBusGenerateClassDefXml(&cdef);
         output.write(std::move(xml).toLocal8Bit());
     }
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index 5479d7425a..4f23b8604d 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -498,13 +498,13 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
     hs << "#include <QtDBus/QDBusPendingReply>" << Qt::endl;
 #endif
 
-    for (const QString &include : qAsConst(includes)) {
+    for (const QString &include : std::as_const(includes)) {
         hs << "#include \"" << include << "\"" << Qt::endl;
         if (headerName.isEmpty())
             cs << "#include \"" << include << "\"" << Qt::endl;
     }
 
-    for (const QString &include : qAsConst(globalIncludes)) {
+    for (const QString &include : std::as_const(globalIncludes)) {
         hs << "#include <" << include << ">" << Qt::endl;
         if (headerName.isEmpty())
             cs << "#include <" << include << ">" << Qt::endl;
@@ -817,13 +817,13 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
     hs << "#include <QtDBus/QDBusObjectPath>" << Qt::endl;
 #endif
 
-    for (const QString &include : qAsConst(includes)) {
+    for (const QString &include : std::as_const(includes)) {
         hs << "#include \"" << include << "\"" << Qt::endl;
         if (headerName.isEmpty())
             cs << "#include \"" << include << "\"" << Qt::endl;
     }
 
-    for (const QString &include : qAsConst(globalIncludes)) {
+    for (const QString &include : std::as_const(globalIncludes)) {
         hs << "#include <" << include << ">" << Qt::endl;
         if (headerName.isEmpty())
             cs << "#include <" << include << ">" << Qt::endl;
diff --git a/src/tools/qlalr/compress.cpp b/src/tools/qlalr/compress.cpp
index c6d0ef14b7..6ee083f7e9 100644
--- a/src/tools/qlalr/compress.cpp
+++ b/src/tools/qlalr/compress.cpp
@@ -139,7 +139,7 @@ void Compress::operator () (int *table, int row_count, int column_count)
 #ifndef QLALR_NO_CHECK_SORTED_TABLE
   int previous_zeros = INT_MAX;
 
-  for (const UncompressedRow &row : qAsConst(sortedTable))
+  for (const UncompressedRow &row : std::as_const(sortedTable))
     {
       int zeros = row.count (0);
 
@@ -151,7 +151,7 @@ void Compress::operator () (int *table, int row_count, int column_count)
 
   index.fill (-999999, row_count);
 
-  for (const UncompressedRow &row : qAsConst(sortedTable))
+  for (const UncompressedRow &row : std::as_const(sortedTable))
     {
       int first_token = std::distance (row.begin (), row.beginNonZeros ());
       QList<int>::iterator pos = info.begin();
@@ -226,7 +226,7 @@ void Compress::operator () (int *table, int row_count, int column_count)
     }
 
 #if 0
-  for (const UncompressedRow &row : qAsConst(sortedTable))
+  for (const UncompressedRow &row : std::as_const(sortedTable))
     {
       int i = row.index ();
       Q_ASSERT (i < sortedTable.size ());
diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp
index a41aa87835..5cea80b378 100644
--- a/src/tools/qlalr/cppgenerator.cpp
+++ b/src/tools/qlalr/cppgenerator.cpp
@@ -413,7 +413,7 @@ void CppGenerator::generateDecl (QTextStream &out)
       << "public:" << Qt::endl
       << "    enum VariousConstants {" << Qt::endl;
 
-  for (const Name &t : qAsConst(grammar.terminals))
+  for (const Name &t : std::as_const(grammar.terminals))
     {
       QString name = *t;
       int value = std::distance (grammar.names.begin (), t);
diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index 460be04272..e7496e94b5 100644
--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
@@ -351,7 +351,7 @@ void Automaton::closure (StatePointer state)
 
       if (_M_grammar->isNonTerminal (*item->dot))
         {
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(*item->dot);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(*item->dot);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -399,7 +399,7 @@ void Automaton::buildLookbackSets ()
           if (! _M_grammar->isNonTerminal (A))
             continue;
 
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(A);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(A);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -594,7 +594,7 @@ void Automaton::buildIncludesDigraph ()
           if (! _M_grammar->isNonTerminal (name))
             continue;
 
-          const auto range = qAsConst(_M_grammar->rule_map).equal_range(name);
+          const auto range = std::as_const(_M_grammar->rule_map).equal_range(name);
           for (auto it = range.first; it != range.second; ++it)
             {
               const RulePointer &rule = *it;
@@ -696,7 +696,7 @@ void Automaton::buildLookaheads ()
     {
       for (ItemPointer item = p->closure.begin (); item != p->closure.end (); ++item)
         {
-          const auto range = qAsConst(lookbacks).equal_range(item);
+          const auto range = std::as_const(lookbacks).equal_range(item);
           for (auto it = range.first; it != range.second; ++it)
             {
               const Lookback &lookback = *it;
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index f9d9ec4ba2..a87f15de33 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -725,7 +725,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     for (auto it = cbegin; it != cend; ++it) {
         if (it.key() == filename && it.value()->m_language == s->m_language &&
             it.value()->m_territory == s->m_territory) {
-            for (const QString &name : qAsConst(m_fileNames)) {
+            for (const QString &name : std::as_const(m_fileNames)) {
                 qWarning("%s: Warning: potential duplicate alias detected: '%s'",
                 qPrintable(name), qPrintable(filename));
             }
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 4ccda8e11e..24ca25e8ee 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -513,7 +513,7 @@ void WriteInitialization::acceptUI(DomUI *node)
 
     if (!m_buddies.empty())
         m_output << language::openQtConfig(shortcutConfigKey());
-    for (const Buddy &b : qAsConst(m_buddies)) {
+    for (const Buddy &b : std::as_const(m_buddies)) {
         const QString buddyVarName = m_driver->widgetVariableName(b.buddyAttributeName);
         if (buddyVarName.isEmpty()) {
             fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n",
@@ -2734,7 +2734,7 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp
             m_setupUiStream << language::closeQtConfig(it.key());
         ++it;
     }
-    for (Item *child : qAsConst(m_children))
+    for (Item *child : std::as_const(m_children))
         child->writeSetupUi(uniqueName);
     return uniqueName;
 }
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index 5af83975b0..a41ef6cac1 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -706,7 +706,7 @@ static bool findDependentQtLibraries(const QString &qtBinDir, const QString &bin
     // Filter out the Qt libraries. Note that depends.exe finds libs from optDirectory if we
     // are run the 2nd time (updating). We want to check against the Qt bin dir libraries
     const int start = result->size();
-    for (const QString &lib : qAsConst(dependentLibs)) {
+    for (const QString &lib : std::as_const(dependentLibs)) {
         if (isQtModule(lib)) {
             const QString path = normalizeFileName(qtBinDir + u'/' + QFileInfo(lib).fileName());
             if (!result->contains(path))
@@ -1002,7 +1002,7 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules,
     const QString absoluteTarget = QFileInfo(target).absoluteFilePath();
     const QString binary = QStringLiteral("lconvert");
     QStringList arguments;
-    for (const QString &prefix : qAsConst(prefixes)) {
+    for (const QString &prefix : std::as_const(prefixes)) {
         arguments.clear();
         const QString targetFile = QStringLiteral("qt_") + prefix + QStringLiteral(".qm");
         arguments.append(QStringLiteral("-o"));
@@ -1325,7 +1325,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
                     }
                     icuLibs.push_back(icuLib);
                 }
-                for (const QString &icuLib : qAsConst(icuLibs)) {
+                for (const QString &icuLib : std::as_const(icuLibs)) {
                     const QString icuPath = findInPath(icuLib);
                     if (icuPath.isEmpty()) {
                         *errorMessage = QStringLiteral("Unable to locate ICU library ") + icuLib;
@@ -1351,7 +1351,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
             if (!qmlDirectory.isEmpty())
                 qmlDirectories.append(qmlDirectory);
         }
-        for (const QString &qmlDirectory : qAsConst(qmlDirectories)) {
+        for (const QString &qmlDirectory : std::as_const(qmlDirectories)) {
             if (optVerboseLevel >= 1)
                 std::wcout << "Scanning " << QDir::toNativeSeparators(qmlDirectory) << ":\n";
             const QmlImportScanResult scanResult =
@@ -1362,19 +1362,19 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
                 return result;
             qmlScanResult.append(scanResult);
             // Additional dependencies of QML plugins.
-            for (const QString &plugin : qAsConst(qmlScanResult.plugins)) {
+            for (const QString &plugin : std::as_const(qmlScanResult.plugins)) {
                 if (!findDependentQtLibraries(libraryLocation, plugin, options.platform, errorMessage, &dependentQtLibs, &wordSize, &detectedDebug, &machineArch))
                     return result;
             }
             if (optVerboseLevel >= 1) {
                 std::wcout << "QML imports:\n";
-                for (const QmlImportScanResult::Module &mod : qAsConst(qmlScanResult.modules)) {
+                for (const QmlImportScanResult::Module &mod : std::as_const(qmlScanResult.modules)) {
                     std::wcout << "  '" << mod.name << "' "
                                << QDir::toNativeSeparators(mod.sourcePath) << '\n';
                 }
                 if (optVerboseLevel >= 2) {
                     std::wcout << "QML plugins:\n";
-                    for (const QString &p : qAsConst(qmlScanResult.plugins))
+                    for (const QString &p : std::as_const(qmlScanResult.plugins))
                         std::wcout << "  " << QDir::toNativeSeparators(p) << '\n';
                 }
             }
@@ -1451,7 +1451,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
         QStringList libraries = deployedQtLibraries;
         if (options.compilerRunTime)
             libraries.append(compilerRunTimeLibs(options.platform, result.isDebug, machineArch));
-        for (const QString &qtLib : qAsConst(libraries)) {
+        for (const QString &qtLib : std::as_const(libraries)) {
             if (!updateLibrary(qtLib, targetPath, options, errorMessage))
                 return result;
         }
@@ -1500,7 +1500,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
     // for WebKit1-applications. Check direct dependency only.
     if (options.quickImports && (usesQuick1 || usesQml2)) {
         if (usesQml2) {
-            for (const QmlImportScanResult::Module &module : qAsConst(qmlScanResult.modules)) {
+            for (const QmlImportScanResult::Module &module : std::as_const(qmlScanResult.modules)) {
                 const QString installPath = module.installPath(options.directory);
                 if (optVerboseLevel > 1)
                     std::wcout << "Installing: '" << module.name
@@ -1523,7 +1523,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
                     qtpathsVariables.value(QStringLiteral("QT_INSTALL_IMPORTS"));
             const QmlDirectoryFileEntryFunction qmlFileEntryFunction(options.platform, debugMatchMode, options.deployPdb ? QmlDirectoryFileEntryFunction::DeployPdb : 0);
             QStringList quick1Imports(QStringLiteral("Qt"));
-            for (const QString &quick1Import : qAsConst(quick1Imports)) {
+            for (const QString &quick1Import : std::as_const(quick1Imports)) {
                 const QString sourceFile = quick1ImportPath + slash + quick1Import;
                 if (!updateFile(sourceFile, qmlFileEntryFunction, options.directory, options.updateFileFlags, options.json, errorMessage))
                     return result;
diff --git a/src/tools/windeployqt/utils.cpp b/src/tools/windeployqt/utils.cpp
index 41b2d2f063..7e1f485d68 100644
--- a/src/tools/windeployqt/utils.cpp
+++ b/src/tools/windeployqt/utils.cpp
@@ -373,7 +373,7 @@ bool runProcess(const QString &binary, const QStringList &args,
         char **argv  = new char *[args.size() + 2]; // Create argv.
         char **ap = argv;
         *ap++ = encodeFileName(binary);
-        for (const QString &a : qAsConst(args))
+        for (const QString &a : std::as_const(args))
             *ap++ = encodeFileName(a);
         *ap = 0;
 
@@ -868,7 +868,7 @@ QString findD3dCompiler(Platform platform, const QString &qtBinDir, unsigned wor
         candidateVersions.append(prefix + QString::number(i) + suffix);
     // Check the bin directory of the Qt SDK (in case it is shadowed by the
     // Windows system directory in PATH).
-    for (const QString &candidate : qAsConst(candidateVersions)) {
+    for (const QString &candidate : std::as_const(candidateVersions)) {
         const QFileInfo fi(qtBinDir + u'/' + candidate);
         if (fi.isFile())
             return fi.absoluteFilePath();
@@ -877,7 +877,7 @@ QString findD3dCompiler(Platform platform, const QString &qtBinDir, unsigned wor
     if (platform.testFlag(IntelBased)) {
         QString errorMessage;
         unsigned detectedWordSize;
-        for (const QString &candidate : qAsConst(candidateVersions)) {
+        for (const QString &candidate : std::as_const(candidateVersions)) {
             const QString dll = findInPath(candidate);
             if (!dll.isEmpty()
                 && readPeExecutable(dll, &errorMessage, 0, &detectedWordSize, 0)
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 3d5154a30f..7d165cadd1 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -177,7 +177,7 @@ QAccessibleTabBar::QAccessibleTabBar(QWidget *w)
 
 QAccessibleTabBar::~QAccessibleTabBar()
 {
-    for (QAccessible::Id id : qAsConst(m_childInterfaces))
+    for (QAccessible::Id id : std::as_const(m_childInterfaces))
         QAccessible::deleteAccessibleInterface(id);
 }
 
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index fecb2835a8..79a7228369 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -79,7 +79,7 @@ bool QAccessibleTable::isValid() const
 
 QAccessibleTable::~QAccessibleTable()
 {
-    for (QAccessible::Id id : qAsConst(childToId))
+    for (QAccessible::Id id : std::as_const(childToId))
         QAccessible::deleteAccessibleInterface(id);
 }
 
@@ -546,7 +546,7 @@ void QAccessibleTable::modelChange(QAccessibleTableModelChangeEvent *event)
 
     switch (event->modelChangeType()) {
     case QAccessibleTableModelChangeEvent::ModelReset:
-        for (QAccessible::Id id : qAsConst(childToId))
+        for (QAccessible::Id id : std::as_const(childToId))
             QAccessible::deleteAccessibleInterface(id);
         childToId.clear();
         break;
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 93e4b0554d..1d72a82456 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -85,7 +85,7 @@ QAccessibleInterface *QAccessibleMenu::parent() const
         const QList<QObject *> associatedObjects = menuAction->associatedObjects();
         parentCandidates.reserve(associatedObjects.size() + 1);
         parentCandidates << menu()->parentWidget() << associatedObjects;
-        for (QObject *object : qAsConst(parentCandidates)) {
+        for (QObject *object : std::as_const(parentCandidates)) {
             if (qobject_cast<QMenu*>(object)
 #if QT_CONFIG(menubar)
                 || qobject_cast<QMenuBar*>(object)
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 1eb19dc399..694c035c26 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -3602,11 +3602,11 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
             if (oldFiles.removeAll(idx) == 0)
                 newFiles.append(idx);
         }
-        for (const auto &newFile : qAsConst(newFiles))
+        for (const auto &newFile : std::as_const(newFiles))
             select(newFile);
         if (lineEdit()->hasFocus()) {
             auto *sm = qFileDialogUi->listView->selectionModel();
-            for (const auto &oldFile : qAsConst(oldFiles))
+            for (const auto &oldFile : std::as_const(oldFiles))
                 sm->select(oldFile, QItemSelectionModel::Toggle | QItemSelectionModel::Rows);
         }
     }
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index e06727d145..884517d53f 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -698,7 +698,7 @@ void QWizardPrivate::reset()
         for (int i = history.size() - 1; i >= 0; --i)
             q->cleanupPage(history.at(i));
         history.clear();
-        for (QWizardPage *page : qAsConst(pageMap))
+        for (QWizardPage *page : std::as_const(pageMap))
             page->d_func()->initialized = false;
 
         current = -1;
diff --git a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
index 70fb1fe62d..b0b0500fab 100644
--- a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
@@ -34,7 +34,7 @@ exec(e->globalPos());
 //! [6]
 QMenu menu;
 QAction *at = actions[0]; // Assumes actions is not empty
-for (QAction *a : qAsConst(actions))
+for (QAction *a : std::as_const(actions))
     menu.addAction(a);
 menu.exec(pos, at);
 //! [6]
diff --git a/src/widgets/doc/snippets/qlistview-dnd/model.cpp b/src/widgets/doc/snippets/qlistview-dnd/model.cpp
index 045d1e81f9..be2189d1be 100644
--- a/src/widgets/doc/snippets/qlistview-dnd/model.cpp
+++ b/src/widgets/doc/snippets/qlistview-dnd/model.cpp
@@ -74,7 +74,7 @@ bool DragDropListModel::dropMimeData(const QMimeData *data,
 
 //! [6]
     insertRows(beginRow, rows, QModelIndex());
-    for (const QString &text : qAsConst(newItems)) {
+    for (const QString &text : std::as_const(newItems)) {
         QModelIndex idx = index(beginRow, 0, QModelIndex());
         setData(idx, text);
         beginRow++;
diff --git a/src/widgets/doc/snippets/updating-selections/window.cpp b/src/widgets/doc/snippets/updating-selections/window.cpp
index b47e15e084..b965b81008 100644
--- a/src/widgets/doc/snippets/updating-selections/window.cpp
+++ b/src/widgets/doc/snippets/updating-selections/window.cpp
@@ -42,7 +42,7 @@ void MainWindow::updateSelection(const QItemSelection &selected,
 {
     QModelIndexList items = selected.indexes();
 
-    for (const QModelIndex &index : qAsConst(items)) {
+    for (const QModelIndex &index : std::as_const(items)) {
         QString text = QString("(%1,%2)").arg(index.row()).arg(index.column());
         model->setData(index, text);
 //! [0] //! [1]
@@ -52,7 +52,7 @@ void MainWindow::updateSelection(const QItemSelection &selected,
 //! [2]
     items = deselected.indexes();
 
-    for (const QModelIndex &index : qAsConst(items)) {
+    for (const QModelIndex &index : std::as_const(items)) {
         model->setData(index, QString());
 }
 //! [2]
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 81c18741e5..7b2e3fe734 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2480,7 +2480,7 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Qt::Orientation orientation)
 
             // Check if this constraint have some overlap with current
             // trunk variables...
-            for (QSimplexVariable *ad : qAsConst(trunkVariables)) {
+            for (QSimplexVariable *ad : std::as_const(trunkVariables)) {
                 if (c->variables.contains(ad)) {
                     match = true;
                     break;
@@ -2529,7 +2529,7 @@ void QGraphicsAnchorLayoutPrivate::identifyFloatItems(const QSet<AnchorData *> &
         identifyNonFloatItems_helper(ad, &nonFloating);
 
     QSet<QGraphicsLayoutItem *> floatItems;
-    for (QGraphicsLayoutItem *item : qAsConst(items)) {
+    for (QGraphicsLayoutItem *item : std::as_const(items)) {
         if (!nonFloating.contains(item))
             floatItems.insert(item);
     }
@@ -2588,7 +2588,7 @@ void QGraphicsAnchorLayoutPrivate::setItemsGeometries(const QRectF &geom)
     top += geom.top();
     right = geom.right() - right;
 
-    for (QGraphicsLayoutItem *item : qAsConst(items)) {
+    for (QGraphicsLayoutItem *item : std::as_const(items)) {
         QRectF newGeom;
         QSizeF itemPreferredSize = item->effectiveSizeHint(Qt::PreferredSize);
         if (m_floatItems[Qt::Horizontal].contains(item)) {
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 02a24f99fa..f622670aff 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -1036,7 +1036,7 @@ void QGraphicsItemPrivate::setIsMemberOfGroup(bool enabled)
     Q_Q(QGraphicsItem);
     isMemberOfGroup = enabled;
     if (!qgraphicsitem_cast<QGraphicsItemGroup *>(q)) {
-        for (QGraphicsItem *child : qAsConst(children))
+        for (QGraphicsItem *child : std::as_const(children))
             child->d_func()->setIsMemberOfGroup(enabled);
     }
 }
@@ -2458,7 +2458,7 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly,
     const bool updateChildren = update && !((flags & QGraphicsItem::ItemClipsChildrenToShape
                                              || flags & QGraphicsItem::ItemContainsChildrenInShape)
                                             && !(flags & QGraphicsItem::ItemHasNoContents));
-    for (QGraphicsItem *child : qAsConst(children)) {
+    for (QGraphicsItem *child : std::as_const(children)) {
         if (!newVisible || !child->d_ptr->explicitlyHidden)
             child->d_ptr->setVisibleHelper(newVisible, false, updateChildren, hiddenByPanel);
     }
@@ -2650,7 +2650,7 @@ void QGraphicsItemPrivate::setEnabledHelper(bool newEnabled, bool explicitly, bo
     if (update)
         q_ptr->update();
 
-    for (QGraphicsItem *child : qAsConst(children)) {
+    for (QGraphicsItem *child : std::as_const(children)) {
         if (!newEnabled || !child->d_ptr->explicitlyDisabled)
             child->d_ptr->setEnabledHelper(newEnabled, /* explicitly = */ false);
     }
@@ -3917,7 +3917,7 @@ void QGraphicsItem::ensureVisible(const QRectF &rect, int xmargin, int ymargin)
             sceneRect = sceneTransform().mapRect(rect);
         else
             sceneRect = sceneBoundingRect();
-        for (QGraphicsView *view : qAsConst(d_ptr->scene->d_func()->views))
+        for (QGraphicsView *view : std::as_const(d_ptr->scene->d_func()->views))
             view->ensureVisible(sceneRect, xmargin, ymargin);
     }
 }
@@ -4627,7 +4627,7 @@ inline void QGraphicsItemPrivate::sendScenePosChange()
         if (flags & QGraphicsItem::ItemSendsScenePositionChanges)
             q->itemChange(QGraphicsItem::ItemScenePositionHasChanged, q->scenePos());
         if (scenePosDescendants) {
-            for (QGraphicsItem *item : qAsConst(scene->d_func()->scenePosItems)) {
+            for (QGraphicsItem *item : std::as_const(scene->d_func()->scenePosItems)) {
                 if (q->isAncestorOf(item))
                     item->itemChange(QGraphicsItem::ItemScenePositionHasChanged, item->scenePos());
             }
@@ -7083,7 +7083,7 @@ void QGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             selectedItems = d_ptr->scene->selectedItems();
             initialPositions = d_ptr->scene->d_func()->movingItemsInitialPositions;
             if (initialPositions.isEmpty()) {
-                for (QGraphicsItem *item : qAsConst(selectedItems))
+                for (QGraphicsItem *item : std::as_const(selectedItems))
                     initialPositions[item] = item->pos();
                 initialPositions[this] = pos();
             }
@@ -7192,7 +7192,7 @@ void QGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
                     // temporarily removing this item from the selection list.
                     if (d_ptr->selected) {
                         scene->d_func()->selectedItems.remove(this);
-                        for (QGraphicsItem *item : qAsConst(scene->d_func()->selectedItems)) {
+                        for (QGraphicsItem *item : std::as_const(scene->d_func()->selectedItems)) {
                             if (item->isSelected()) {
                                 selectionChanged = true;
                                 break;
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index d00851c1aa..60d62c084b 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -461,7 +461,7 @@ void QGraphicsProxyWidgetPrivate::embedSubWindow(QWidget *subWin)
 */
 void QGraphicsProxyWidgetPrivate::unembedSubWindow(QWidget *subWin)
 {
-    for (QGraphicsItem *child : qAsConst(children)) {
+    for (QGraphicsItem *child : std::as_const(children)) {
         if (child->isWidget()) {
             if (QGraphicsProxyWidget *proxy = qobject_cast<QGraphicsProxyWidget *>(static_cast<QGraphicsWidget *>(child))) {
                 if (proxy->widget() == subWin) {
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 84bcb661a3..dbe6ed9b02 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -330,7 +330,7 @@ void QGraphicsScenePrivate::_q_emitUpdated()
     // needs to happen in order to keep compatibility with the behavior from
     // Qt 4.4 and backward.
     if (isSignalConnected(changedSignalIndex)) {
-        for (auto view : qAsConst(views)) {
+        for (auto view : std::as_const(views)) {
             if (!view->d_func()->connectedToScene) {
                 view->d_func()->connectedToScene = true;
                 q->connect(q, SIGNAL(changed(QList<QRectF>)),
@@ -342,10 +342,10 @@ void QGraphicsScenePrivate::_q_emitUpdated()
             updateAll = false;
             return;
         }
-        for (auto view : qAsConst(views))
+        for (auto view : std::as_const(views))
             view->d_func()->processPendingUpdates();
         // It's important that we update all views before we dispatch, hence two for-loops.
-        for (auto view : qAsConst(views))
+        for (auto view : std::as_const(views))
             view->d_func()->dispatchPendingUpdateRequests();
         return;
     }
@@ -448,7 +448,7 @@ void QGraphicsScenePrivate::_q_processDirtyItems()
         Q_ASSERT(calledEmitUpdated);
         // No need for further processing (except resetting the dirty states).
         // The growingItemsBoundingRect is updated in _q_emitUpdated.
-        for (auto topLevelItem : qAsConst(topLevelItems))
+        for (auto topLevelItem : std::as_const(topLevelItems))
             resetDirtyItem(topLevelItem, /*recursive=*/true);
         return;
     }
@@ -457,7 +457,7 @@ void QGraphicsScenePrivate::_q_processDirtyItems()
     const QRectF oldGrowingItemsBoundingRect = growingItemsBoundingRect;
 
     // Process items recursively.
-    for (auto topLevelItem : qAsConst(topLevelItems))
+    for (auto topLevelItem : std::as_const(topLevelItems))
         processDirtyItemsRecursive(topLevelItem);
 
     dirtyGrowingItemsBoundingRect = false;
@@ -467,7 +467,7 @@ void QGraphicsScenePrivate::_q_processDirtyItems()
     if (wasPendingSceneUpdate)
         return;
 
-    for (auto view : qAsConst(views))
+    for (auto view : std::as_const(views))
         view->d_func()->processPendingUpdates();
 
     if (calledEmitUpdated) {
@@ -478,7 +478,7 @@ void QGraphicsScenePrivate::_q_processDirtyItems()
     }
 
     // Immediately dispatch all pending update requests on the views.
-    for (auto view : qAsConst(views))
+    for (auto view : std::as_const(views))
         view->d_func()->dispatchPendingUpdateRequests();
 }
 
@@ -521,7 +521,7 @@ void QGraphicsScenePrivate::unregisterScenePosItem(QGraphicsItem *item)
 */
 void QGraphicsScenePrivate::_q_updateScenePosDescendants()
 {
-    for (QGraphicsItem *item : qAsConst(scenePosItems)) {
+    for (QGraphicsItem *item : std::as_const(scenePosItems)) {
         QGraphicsItem *p = item->d_ptr->parent;
         while (p) {
             p->d_ptr->scenePosDescendants = 1;
@@ -574,7 +574,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
     //attributes (e.g. sceneTransform).
     if (!item->d_ptr->inDestructor) {
         // Remove all children recursively
-        for (auto child : qAsConst(item->d_ptr->children))
+        for (auto child : std::as_const(item->d_ptr->children))
             q->removeItem(child);
     }
 
@@ -1080,7 +1080,7 @@ void QGraphicsScenePrivate::clearKeyboardGrabber()
 
 void QGraphicsScenePrivate::enableMouseTrackingOnViews()
 {
-    for (QGraphicsView *view : qAsConst(views))
+    for (QGraphicsView *view : std::as_const(views))
         view->viewport()->setMouseTracking(true);
 }
 
@@ -1343,7 +1343,7 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
     // Set focus on the topmost enabled item that can take focus.
     bool setFocus = false;
 
-    for (QGraphicsItem *item : qAsConst(cachedItemsUnderMouse)) {
+    for (QGraphicsItem *item : std::as_const(cachedItemsUnderMouse)) {
         if (item->isBlockedByModalPanel()
             || (item->d_ptr->flags & QGraphicsItem::ItemStopsFocusHandling)) {
             // Make sure we don't clear focus.
@@ -1366,7 +1366,7 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
 
     // Check for scene modality.
     bool sceneModality = false;
-    for (auto modalPanel : qAsConst(modalPanels)) {
+    for (auto modalPanel : std::as_const(modalPanels)) {
         if (modalPanel->panelModality() == QGraphicsItem::SceneModal) {
             sceneModality = true;
             break;
@@ -1385,7 +1385,7 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
     // candidates one at a time, until the event is accepted. It's accepted by
     // default, so the receiver has to explicitly ignore it for it to pass
     // through.
-    for (QGraphicsItem *item : qAsConst(cachedItemsUnderMouse)) {
+    for (QGraphicsItem *item : std::as_const(cachedItemsUnderMouse)) {
         if (!(item->acceptedMouseButtons() & mouseEvent->button())) {
             // Skip items that don't accept the event's mouse button.
             continue;
@@ -1661,7 +1661,7 @@ QGraphicsScene::~QGraphicsScene()
     // Remove this scene from all associated views.
     // Note: d->views is modified by QGraphicsView::setScene, so must make a copy
     const auto views = d->views;
-    for (auto view : qAsConst(views))
+    for (auto view : std::as_const(views))
         view->setScene(nullptr);
 }
 
@@ -2132,7 +2132,7 @@ QList<QGraphicsItem *> QGraphicsScene::selectedItems() const
     // Optimization: Lazily removes items that are not selected.
     QGraphicsScene *that = const_cast<QGraphicsScene *>(this);
     QSet<QGraphicsItem *> actuallySelectedSet;
-    for (QGraphicsItem *item : qAsConst(that->d_func()->selectedItems)) {
+    for (QGraphicsItem *item : std::as_const(that->d_func()->selectedItems)) {
         if (item->isSelected())
             actuallySelectedSet << item;
     }
@@ -2222,7 +2222,7 @@ void QGraphicsScene::setSelectionArea(const QPainterPath &path,
     switch (selectionOperation) {
     case Qt::ReplaceSelection:
         // Deselect all items outside path.
-        for (QGraphicsItem *item : qAsConst(unselectItems)) {
+        for (QGraphicsItem *item : std::as_const(unselectItems)) {
             item->setSelected(false);
             changed = true;
         }
@@ -2516,7 +2516,7 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
 
     // Add all children recursively
     item->d_ptr->ensureSortedChildren();
-    for (auto child : qAsConst(item->d_ptr->children))
+    for (auto child : std::as_const(item->d_ptr->children))
         addItem(child);
 
     // Resolve font and palette.
@@ -3019,7 +3019,7 @@ void QGraphicsScene::setBackgroundBrush(const QBrush &brush)
 {
     Q_D(QGraphicsScene);
     d->backgroundBrush = brush;
-    for (QGraphicsView *view : qAsConst(d->views)) {
+    for (QGraphicsView *view : std::as_const(d->views)) {
         view->resetCachedContent();
         view->viewport()->update();
     }
@@ -3108,13 +3108,13 @@ void QGraphicsScene::update(const QRectF &rect)
         d->updatedRects.clear();
         if (directUpdates) {
             // Update all views.
-            for (auto view : qAsConst(d->views))
+            for (auto view : std::as_const(d->views))
                 view->d_func()->fullUpdatePending = true;
         }
     } else {
         if (directUpdates) {
             // Update all views.
-            for (auto view : qAsConst(d->views)) {
+            for (auto view : std::as_const(d->views)) {
                 if (view->isTransformed())
                     view->d_func()->updateRectF(view->viewportTransform().mapRect(rect));
                 else
@@ -3775,7 +3775,7 @@ bool QGraphicsScenePrivate::dispatchHoverEvent(QGraphicsSceneHoverEvent *hoverEv
     }
 
     QGraphicsItem *item = nullptr;
-    for (auto tmp : qAsConst(cachedItemsUnderMouse)) {
+    for (auto tmp : std::as_const(cachedItemsUnderMouse)) {
         if (itemAcceptsHoverEvents_helper(tmp)) {
             item = tmp;
             break;
@@ -4398,7 +4398,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
             QRegion pixmapExposed;
             QRectF exposedRect;
             if (!itemCache->allExposed) {
-                for (const auto &rect : qAsConst(itemCache->exposed)) {
+                for (const auto &rect : std::as_const(itemCache->exposed)) {
                     exposedRect |= rect;
                     pixmapExposed += itemToPixmap.mapRect(rect).toAlignedRect();
                 }
@@ -4558,7 +4558,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
             // Map the item's logical expose to pixmap coordinates.
             QRegion pixmapExposed = scrollExposure;
             if (!itemCache->allExposed) {
-                for (const auto &rect : qAsConst(itemCache->exposed))
+                for (const auto &rect : std::as_const(itemCache->exposed))
                     pixmapExposed += itemToPixmap.mapRect(rect).toRect().adjusted(-1, -1, 1, 1);
             }
 
@@ -4567,10 +4567,10 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
             if (itemCache->allExposed) {
                 br = item->boundingRect();
             } else {
-                for (const auto &rect : qAsConst(itemCache->exposed))
+                for (const auto &rect : std::as_const(itemCache->exposed))
                     br |= rect;
                 QTransform pixmapToItem = itemToPixmap.inverted();
-                for (const QRect &r : qAsConst(scrollExposure))
+                for (const QRect &r : std::as_const(scrollExposure))
                     br |= pixmapToItem.mapRect(r);
             }
             styleOptionTmp = *option;
@@ -4977,7 +4977,7 @@ void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, b
             return;
         }
 
-        for (auto view : qAsConst(views)) {
+        for (auto view : std::as_const(views)) {
             QGraphicsViewPrivate *viewPrivate = view->d_func();
             QRect rect = item->d_ptr->paintedViewBoundingRects.value(viewPrivate->viewport);
             rect.translate(viewPrivate->dirtyScrollOffset);
@@ -5133,7 +5133,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
             QRectF dirtyRect;
             bool uninitializedDirtyRect = true;
 
-            for (auto view : qAsConst(views)) {
+            for (auto view : std::as_const(views)) {
                 QGraphicsViewPrivate *viewPrivate = view->d_func();
                 QRect &paintedViewBoundingRect = item->d_ptr->paintedViewBoundingRects[viewPrivate->viewport];
                 if (viewPrivate->fullUpdatePending
@@ -5191,7 +5191,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
         const bool bypassUpdateClip = !itemHasContents && wasDirtyParentViewBoundingRects;
         if (itemClipsChildrenToShape && !bypassUpdateClip) {
             // Make sure child updates are clipped to the item's bounding rect.
-            for (auto view : qAsConst(views))
+            for (auto view : std::as_const(views))
                 view->d_func()->setUpdateClip(item);
         }
         if (!dirtyAncestorContainsChildren) {
@@ -5201,7 +5201,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
         const bool allChildrenDirty = item->d_ptr->allChildrenDirty;
         const bool parentIgnoresVisible = item->d_ptr->ignoreVisible;
         const bool parentIgnoresOpacity = item->d_ptr->ignoreOpacity;
-        for (auto child : qAsConst(item->d_ptr->children)) {
+        for (auto child : std::as_const(item->d_ptr->children)) {
             if (wasDirtyParentSceneTransform)
                 child->d_ptr->dirtySceneTransform = 1;
             if (wasDirtyParentViewBoundingRects)
@@ -5221,7 +5221,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
 
         if (itemClipsChildrenToShape) {
             // Reset updateClip.
-            for (auto view : qAsConst(views))
+            for (auto view : std::as_const(views))
                 view->d_func()->setUpdateClip(nullptr);
         }
     } else if (wasDirtyParentSceneTransform) {
@@ -5302,7 +5302,7 @@ void QGraphicsScene::drawItems(QPainter *painter,
 
     d->rectAdjust = oldRectAdjust;
     // Reset discovery bits.
-    for (auto topLevelItem : qAsConst(topLevelItems))
+    for (auto topLevelItem : std::as_const(topLevelItems))
         topLevelItem->d_ptr->itemDiscovered = 0;
 
     painter->setWorldTransform(viewTransform);
@@ -5821,7 +5821,7 @@ int QGraphicsScenePrivate::findClosestTouchPointId(const QPointF &scenePos)
 {
     int closestTouchPointId = -1;
     qreal closestDistance = qreal(0.);
-    for (const QEventPoint &touchPoint : qAsConst(sceneCurrentTouchPoints)) {
+    for (const QEventPoint &touchPoint : std::as_const(sceneCurrentTouchPoints)) {
         qreal distance = QLineF(scenePos, touchPoint.scenePosition()).length();
         if (closestTouchPointId == -1|| distance < closestDistance) {
             closestTouchPointId = touchPoint.id();
@@ -5971,7 +5971,7 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
         // Set focus on the topmost enabled item that can take focus.
         bool setFocus = false;
 
-        for (QGraphicsItem *item : qAsConst(cachedItemsUnderMouse)) {
+        for (QGraphicsItem *item : std::as_const(cachedItemsUnderMouse)) {
             if (item->isEnabled() && ((item->flags() & QGraphicsItem::ItemIsFocusable) && item->d_ptr->mouseSetsFocus)) {
                 if (!item->isWidget() || ((QGraphicsWidget *)item)->focusPolicy() & Qt::ClickFocus) {
                     setFocus = true;
@@ -5998,7 +5998,7 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
 
     bool res = false;
     bool eventAccepted = touchEvent->isAccepted();
-    for (QGraphicsItem *item : qAsConst(cachedItemsUnderMouse)) {
+    for (QGraphicsItem *item : std::as_const(cachedItemsUnderMouse)) {
         // first, try to deliver the touch event
         updateTouchPointsForItem(item, touchEvent);
         bool acceptTouchEvents = item->acceptTouchEvents();
@@ -6030,13 +6030,13 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
 
 void QGraphicsScenePrivate::enableTouchEventsOnViews()
 {
-    for (QGraphicsView *view : qAsConst(views))
+    for (QGraphicsView *view : std::as_const(views))
         view->viewport()->setAttribute(Qt::WA_AcceptTouchEvents, true);
 }
 
 void QGraphicsScenePrivate::updateInputMethodSensitivityInViews()
 {
-    for (auto view : qAsConst(views))
+    for (auto view : std::as_const(views))
         view->d_func()->updateInputMethodSensitivity();
 }
 
@@ -6402,7 +6402,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
         }
     }
 
-    for (QGesture *g : qAsConst(startedGestures)) {
+    for (QGesture *g : std::as_const(startedGestures)) {
         if (g->gestureCancelPolicy() == QGesture::CancelAllInContext) {
             DEBUG() << "lets try to cancel some";
             // find gestures in context in Qt::GestureStarted or Qt::GestureUpdated state and cancel them
@@ -6515,7 +6515,7 @@ void QGraphicsScenePrivate::grabGesture(QGraphicsItem *, Qt::GestureType gesture
 {
     (void)QGestureManager::instance(); // create a gesture manager
     if (!grabbedGestures[gesture]++) {
-        for (QGraphicsView *view : qAsConst(views))
+        for (QGraphicsView *view : std::as_const(views))
             view->viewport()->grabGesture(gesture);
     }
 }
@@ -6527,7 +6527,7 @@ void QGraphicsScenePrivate::ungrabGesture(QGraphicsItem *item, Qt::GestureType g
     QGraphicsObject *obj = static_cast<QGraphicsObject *>(item);
     QGestureManager::instance()->cleanupCachedGestures(obj, gesture);
     if (!--grabbedGestures[gesture]) {
-        for (QGraphicsView *view : qAsConst(views))
+        for (QGraphicsView *view : std::as_const(views))
             view->viewport()->ungrabGesture(gesture);
     }
 }
diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp
index 7ee7f9b382..1ba6fe787a 100644
--- a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp
@@ -80,7 +80,7 @@ QList<QGraphicsItem *> QGraphicsSceneBspTree::items(const QRectF &rect, bool onl
         }
     }, rect);
     // Reset discovery bits.
-    for (const auto &foundItem : qAsConst(foundItems))
+    for (const auto &foundItem : std::as_const(foundItems))
         foundItem->d_ptr->itemDiscovered = 0;
     return foundItems;
 }
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 6163267b34..fb49983bbf 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -666,7 +666,7 @@ void QGraphicsViewPrivate::mouseMoveEventHandler(QMouseEvent *event)
                                                                                   mouseEvent.widget());
     }
     // Find the topmost item under the mouse with a cursor.
-    for (QGraphicsItem *item : qAsConst(scene->d_func()->cachedItemsUnderMouse)) {
+    for (QGraphicsItem *item : std::as_const(scene->d_func()->cachedItemsUnderMouse)) {
         if (item->isEnabled() && item->hasCursor()) {
             _q_setViewportCursor(item->cursor());
             return;
@@ -2652,7 +2652,7 @@ void QGraphicsView::updateScene(const QList<QRectF> &rects)
         dirtyViewportRects << xrect;
     }
 
-    for (const QRect &rect : qAsConst(dirtyViewportRects)) {
+    for (const QRect &rect : std::as_const(dirtyViewportRects)) {
         // Add the exposed rect to the update region. In rect update
         // mode, we only count the bounding rect of items.
         if (!boundingRectUpdate) {
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index a253dcebb3..3679723bc4 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -199,7 +199,7 @@ QGraphicsWidget::~QGraphicsWidget()
     Q_D(QGraphicsWidget);
 #ifndef QT_NO_ACTION
     // Remove all actions from this widget
-    for (auto action : qAsConst(d->actions)) {
+    for (auto action : std::as_const(d->actions)) {
         QActionPrivate *apriv = action->d_func();
         apriv->associatedObjects.removeAll(this);
     }
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index d70d566d9c..90c3b282ee 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -4159,7 +4159,7 @@ bool QHeaderViewPrivate::read(QDataStream &in)
     }
 
     int sectionItemsLengthTotal = 0;
-    for (const SectionItem &section : qAsConst(newSectionItems))
+    for (const SectionItem &section : std::as_const(newSectionItems))
         sectionItemsLengthTotal += section.size;
     if (sectionItemsLengthTotal != lengthIn)
         return false;
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 85746d994c..359f6da0bd 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -2329,7 +2329,7 @@ int QListModeViewBase::verticalScrollToValue(int index, QListView::ScrollHint hi
         } else {
             int scrollBarValue = verticalScrollBar()->value();
             int numHidden = 0;
-            for (const auto &idx : qAsConst(dd->hiddenRows))
+            for (const auto &idx : std::as_const(dd->hiddenRows))
                 if (idx.row() <= scrollBarValue)
                     ++numHidden;
             value = qBound(0, scrollValueMap.at(verticalScrollBar()->value()) - numHidden, flowPositions.size() - 1);
@@ -3445,7 +3445,7 @@ int QListView::visualIndex(const QModelIndex &index) const
     d->executePostedLayout();
     QListViewItem itm = d->indexToListViewItem(index);
     int visualIndex = d->commonListView->itemIndex(itm);
-    for (const auto &idx : qAsConst(d->hiddenRows)) {
+    for (const auto &idx : std::as_const(d->hiddenRows)) {
         if (idx.row() <= index.row())
             --visualIndex;
     }
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 2f46842712..3cd93f9337 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -907,7 +907,7 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
         }
     }
 
-    for (QSpanCollection::Span *span : qAsConst(visibleSpans)) {
+    for (QSpanCollection::Span *span : std::as_const(visibleSpans)) {
         int row = span->top();
         int col = span->left();
         QModelIndex index = model->index(row, col, root);
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index aef35735ba..77154fee07 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1185,7 +1185,7 @@ void QApplicationPrivate::handlePaletteChanged(const char *className)
     }
 
 #if QT_CONFIG(graphicsview)
-    for (auto scene : qAsConst(scene_list))
+    for (auto scene : std::as_const(scene_list))
         QCoreApplication::sendEvent(scene, &event);
 #endif
 
@@ -2083,7 +2083,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con
         const QPointF globalPos = qIsInf(globalPosF.x())
             ? QPointF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)
             : globalPosF;
-        const QPointF windowPos = qAsConst(enterList).back()->window()->mapFromGlobal(globalPos);
+        const QPointF windowPos = std::as_const(enterList).back()->window()->mapFromGlobal(globalPos);
         for (auto it = enterList.crbegin(), end = enterList.crend(); it != end; ++it) {
             auto *w = *it;
             if (!QApplication::activeModalWidget() || QApplicationPrivate::tryModalHelper(w, nullptr)) {
@@ -3177,7 +3177,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                     break;
                 w = w->parentWidget();
             }
-            for (QGesture *g : qAsConst(allGestures))
+            for (QGesture *g : std::as_const(allGestures))
                 gestureEvent->setAccepted(g, false);
             gestureEvent->m_accept = false; // to make sure we check individual gestures
             break;
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index aa7b70446b..bcbf10b95d 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -1432,7 +1432,7 @@ QWidget::~QWidget()
 
 #ifndef QT_NO_ACTION
     // remove all actions from this widget
-    for (auto action : qAsConst(d->actions)) {
+    for (auto action : std::as_const(d->actions)) {
         QActionPrivate *apriv = action->d_func();
         apriv->associatedObjects.removeAll(this);
     }
diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index effa91ca22..4d5e4e6522 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -565,7 +565,7 @@ static void findAllTextureWidgetsRecursively(QWidget *tlw, QWidget *widget)
         if (!tl->isEmpty())
             QWidgetPrivate::get(tlw)->topData()->widgetTextures.push_back(std::move(tl));
         // Native child widgets, if there was any, get their own separate QPlatformTextureList.
-        for (QWidget *ncw : qAsConst(nativeChildren)) {
+        for (QWidget *ncw : std::as_const(nativeChildren)) {
             if (QWidgetPrivate::get(ncw)->textureChildSeen)
                 findAllTextureWidgetsRecursively(tlw, ncw);
         }
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 566b6100f2..644f463b5d 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -2808,7 +2808,7 @@ static void updateObjects(const QList<const QObject *>& objects)
             QCoreApplication::sendEvent(widget, &event);
             QList<const QObject *> children;
             children.reserve(widget->children().size() + 1);
-            for (auto child: qAsConst(widget->children()))
+            for (auto child: std::as_const(widget->children()))
                 children.append(child);
             updateObjects(children);
         }
@@ -2993,7 +2993,7 @@ void QStyleSheetStyle::repolish(QWidget *w)
 {
     QList<const QObject *> children;
     children.reserve(w->children().size() + 1);
-    for (auto child: qAsConst(w->children()))
+    for (auto child: std::as_const(w->children()))
         children.append(child);
     children.append(w);
     styleSheetCaches->styleSheetCache.remove(w);
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index 91737b301a..2e3602e47a 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -3113,7 +3113,7 @@ void QDockAreaLayout::resizeDocks(const QList<QDockWidget *> &docks,
             if (!info->tabbed && info->o == o) {
                 info->item_list[path.constLast()].size = size;
                 int totalSize = 0;
-                for (const QDockAreaLayoutItem &item : qAsConst(info->item_list)) {
+                for (const QDockAreaLayoutItem &item : std::as_const(info->item_list)) {
                     if (!item.skip()) {
                         if (totalSize != 0)
                             totalSize += sep;
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index 5ba065f084..12d8876fcc 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -1588,9 +1588,9 @@ void QMainWindowLayout::setDocumentMode(bool enabled)
     _documentMode = enabled;
 
     // Update the document mode for all tab bars
-    for (QTabBar *bar : qAsConst(usedTabBars))
+    for (QTabBar *bar : std::as_const(usedTabBars))
         bar->setDocumentMode(_documentMode);
-    for (QTabBar *bar : qAsConst(unusedTabBars))
+    for (QTabBar *bar : std::as_const(unusedTabBars))
         bar->setDocumentMode(_documentMode);
 }
 
@@ -2992,7 +2992,7 @@ bool QMainWindowLayout::restoreState(QDataStream &stream)
 #if QT_CONFIG(dockwidget)
     if (parentWidget()->isVisible()) {
 #if QT_CONFIG(tabbar)
-        for (QTabBar *tab_bar : qAsConst(usedTabBars))
+        for (QTabBar *tab_bar : std::as_const(usedTabBars))
             tab_bar->show();
 
 #endif
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index b4d7785d94..8708e343fd 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -434,8 +434,8 @@ QList<QRect> MinOverlapPlacer::getCandidatePlacements(const QSize &size, const Q
     ylist.erase(std::unique(ylist.begin(), ylist.end()), ylist.end());
 
     result.reserve(ylist.size() * xlist.size());
-    for (int y : qAsConst(ylist))
-        for (int x : qAsConst(xlist))
+    for (int y : std::as_const(ylist))
+        for (int x : std::as_const(xlist))
             result << QRect(QPoint(x, y), size);
     return result;
 }
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index f6689a2537..e789c1bef2 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -2383,7 +2383,7 @@ void QMenuPrivate::popup(const QPoint &p, QAction *atAction, PositionFunction po
             atAction = defaultAction;
             // TODO: This works for first level menus, not yet sub menus
         } else {
-            for (QAction *action : qAsConst(actions))
+            for (QAction *action : std::as_const(actions))
                 if (action->isEnabled()) {
                     atAction = action;
                     break;
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index d5ae7d5cd2..9a9879a48d 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -570,7 +570,7 @@ void QStatusBar::hideOrShow()
     Q_D(QStatusBar);
     bool haveMessage = !d->tempItem.isEmpty();
 
-    for (const auto &item : qAsConst(d->items)) {
+    for (const auto &item : std::as_const(d->items)) {
         if (item.isPermanent())
             break;
         if (haveMessage && item.widget->isVisible()) {
@@ -622,7 +622,7 @@ void QStatusBar::paintEvent(QPaintEvent *event)
     opt.initFrom(this);
     style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this);
 
-    for (const auto &item : qAsConst(d->items)) {
+    for (const auto &item : std::as_const(d->items)) {
         if (item.widget->isVisible() && (!haveMessage || item.isPermanent())) {
             QRect ir = item.widget->geometry().adjusted(-2, -1, 2, 1);
             if (event->rect().intersects(ir)) {
@@ -661,7 +661,7 @@ bool QStatusBar::event(QEvent *e)
         // Calculate new strut height and call reformat() if it has changed
         int maxH = fontMetrics().height();
 
-        for (const auto &item : qAsConst(d->items)) {
+        for (const auto &item : std::as_const(d->items)) {
             const int itemH = qMin(qSmartMinSize(item.widget).height(), item.widget->maximumHeight());
             maxH = qMax(maxH, itemH);
         }
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index ad6d28c523..155dd80337 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -979,7 +979,7 @@ int QTabBar::insertTab(int index, const QIcon& icon, const QString &text)
         setTabButton(index, closeSide, closeButton);
     }
 
-    for (const auto tab : qAsConst(d->tabList)) {
+    for (const auto tab : std::as_const(d->tabList)) {
         if (tab->lastTab >= index)
             ++tab->lastTab;
     }
@@ -1025,7 +1025,7 @@ void QTabBar::removeTab(int index)
         int newIndex = removedTab->lastTab;
         d->tabList.removeAt(index);
         delete removedTab;
-        for (auto tab : qAsConst(d->tabList)) {
+        for (auto tab : std::as_const(d->tabList)) {
             if (tab->lastTab == index)
                 tab->lastTab = -1;
             if (tab->lastTab > index)
@@ -2039,7 +2039,7 @@ void QTabBar::moveTab(int from, int to)
     d->tabList.move(from, to);
 
     // update lastTab locations
-    for (const auto tab : qAsConst(d->tabList))
+    for (const auto tab : std::as_const(d->tabList))
         tab->lastTab = d->calculateNewPosition(from, to, tab->lastTab);
 
     // update external variables
@@ -2257,7 +2257,7 @@ void QTabBarPrivate::moveTabFinished(int index)
     bool cleanup = (pressedIndex == index) || (pressedIndex == -1) || !validIndex(index);
     bool allAnimationsFinished = true;
 #if QT_CONFIG(animation)
-    for (const auto tab : qAsConst(tabList)) {
+    for (const auto tab : std::as_const(tabList)) {
         if (tab->animation && tab->animation->state() == QAbstractAnimation::Running) {
             allAnimationsFinished = false;
             break;
@@ -2267,7 +2267,7 @@ void QTabBarPrivate::moveTabFinished(int index)
     if (allAnimationsFinished && cleanup) {
         if (movingTab)
             movingTab->setVisible(false); // We might not get a mouse release
-        for (auto tab : qAsConst(tabList)) {
+        for (auto tab : std::as_const(tabList)) {
             tab->dragOffset = 0;
         }
         if (pressedIndex != -1 && movable) {
@@ -2545,7 +2545,7 @@ void QTabBar::setTabsClosable(bool closable)
     d->closeButtonOnTabs = closable;
     ButtonPosition closeSide = (ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, this);
     if (!closable) {
-        for (auto tab : qAsConst(d->tabList)) {
+        for (auto tab : std::as_const(d->tabList)) {
             if (closeSide == LeftSide && tab->leftWidget) {
                 tab->leftWidget->deleteLater();
                 tab->leftWidget = nullptr;
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 63edfc5328..1cac46e8a8 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -154,7 +154,7 @@ QString QTextBrowserPrivate::findFile(const QUrl &name) const
     if (QFileInfo(fileName).isAbsolute())
         return fileName;
 
-    for (QString path : qAsConst(searchPaths)) {
+    for (QString path : std::as_const(searchPaths)) {
         if (!path.endsWith(u'/'))
             path.append(u'/');
         path.append(fileName);
author	Marc Mutz <marc.mutz@qt.io>	2022-10-06 11:08:21 +0200
committer	Marc Mutz <marc.mutz@qt.io>	2022-10-11 23:17:18 +0200
commit	aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch)
tree	be5e1a9733987aed8602eb47618cd1673a594570 /src
parent	fd2685c2f0a219c091e028a98ba6cdd154986fec (diff)