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

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

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

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

18 files changed, 42 insertions, 42 deletions

diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index c5a25049f..6bfca9c6d 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -180,7 +180,7 @@ DeleteConnectionsCommand::DeleteConnectionsCommand(ConnectionEdit *edit,
 
 void DeleteConnectionsCommand::redo()
 {
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         const int idx = edit()->indexOfConnection(con);
         emit edit()->aboutToRemoveConnection(con);
         Q_ASSERT(edit()->m_con_list.contains(con));
@@ -194,7 +194,7 @@ void DeleteConnectionsCommand::redo()
 
 void DeleteConnectionsCommand::undo()
 {
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         Q_ASSERT(!edit()->m_con_list.contains(con));
         emit edit()->aboutToAddConnection(edit()->m_con_list.size());
         edit()->m_con_list.append(con);
@@ -960,7 +960,7 @@ void ConnectionEdit::updateBackground()
     if (!m_enable_update_background)
         return;
 
-    for (Connection *c : qAsConst(m_con_list))
+    for (Connection *c : std::as_const(m_con_list))
         c->updateVisibility();
 
     updateLines();
@@ -1038,7 +1038,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
 
     WidgetSet heavy_highlight_set, light_highlight_set;
 
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (!con->isVisible())
             continue;
 
@@ -1056,7 +1056,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    for (QWidget *w : qAsConst(heavy_highlight_set)) {
+    for (QWidget *w : std::as_const(heavy_highlight_set)) {
         p.drawRect(fixRect(widgetRect(w)));
         light_highlight_set.remove(w);
     }
@@ -1066,12 +1066,12 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    for (QWidget *w : qAsConst(light_highlight_set))
+    for (QWidget *w : std::as_const(light_highlight_set))
         p.drawRect(fixRect(widgetRect(w)));
 
     p.setBrush(palette().color(QPalette::Base));
     p.setPen(palette().color(QPalette::Text));
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (con->isVisible()) {
             paintLabel(&p, EndPoint::Source, con);
             paintLabel(&p, EndPoint::Target, con);
@@ -1081,7 +1081,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     p.setPen(m_active_color);
     p.setBrush(m_active_color);
 
-    for (Connection *con : qAsConst(m_con_list)) {
+    for (Connection *con : std::as_const(m_con_list)) {
         if (!selected(con) || !con->isVisible())
             continue;
 
@@ -1402,7 +1402,7 @@ bool ConnectionEdit::selected(const Connection *con) const
 
 void ConnectionEdit::selectNone()
 {
-    for (Connection *con : qAsConst(m_sel_con_set))
+    for (Connection *con : std::as_const(m_sel_con_set))
         con->update();
 
     m_sel_con_set.clear();
@@ -1412,7 +1412,7 @@ void ConnectionEdit::selectAll()
 {
     if (m_sel_con_set.size() == m_con_list.size())
         return;
-    for (Connection *con : qAsConst(m_con_list))
+    for (Connection *con : std::as_const(m_con_list))
         setSelected(con, true);
 }
 
@@ -1491,7 +1491,7 @@ void ConnectionEdit::addConnection(Connection *con)
 
 void ConnectionEdit::updateLines()
 {
-    for (Connection *con : qAsConst(m_con_list))
+    for (Connection *con : std::as_const(m_con_list))
         con->checkWidgets();
 }
 
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index 4428ee2bb..db0100f01 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -240,7 +240,7 @@ void FormWindowBase::reloadProperties()
             toolBox->setCurrentIndex(current);
         }
     }
-    for (QObject *object : qAsConst(m_d->m_reloadablePropertySheets)) {
+    for (QObject *object : std::as_const(m_d->m_reloadablePropertySheets)) {
         reloadIconResources(iconCache(), object);
     }
 }
@@ -426,7 +426,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list)
         tr("Delete '%1'").arg(widget_list.constFirst()->objectName()) : tr("Delete");
 
     commandHistory()->beginMacro(description);
-    for (QWidget *w : qAsConst(widget_list)) {
+    for (QWidget *w : std::as_const(widget_list)) {
         emit widgetRemoved(w);
         DeleteWidgetCommand *cmd = new DeleteWidgetCommand(this);
         cmd->init(w);
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index 7eb145acc..76dac5668 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -416,7 +416,7 @@ IconSelector::IconSelector(QWidget *parent) :
 
     int index = 0;
     QStringList items;
-    for (const auto &item : qAsConst(d_ptr->m_stateToName)) {
+    for (const auto &item : std::as_const(d_ptr->m_stateToName)) {
         const QPair<QIcon::Mode, QIcon::State> state = item.first;
         const QString name = item.second;
 
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index fb8c22619..b2d8922c9 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -115,7 +115,7 @@ void Layout::setup()
     // Widgets which are already laid out are thrown away here too
 
     QMultiMap<QWidget*, QWidget*> lists;
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         QWidget *p = w->parentWidget();
 
         if (p && LayoutInfo::layoutType(m_formWindow->core(), p) != LayoutInfo::NoLayout
@@ -159,7 +159,7 @@ void Layout::setup()
     // be placed and connect to widgetDestroyed() signals of the
     // widgets to get informed if one gets deleted to be able to
     // handle that and do not crash in this case
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         connect(w, &QObject::destroyed, this, &Layout::widgetDestroyed);
         m_startPoint = QPoint(qMin(m_startPoint.x(), w->x()), qMin(m_startPoint.y(), w->y()));
         const QRect rc(w->geometry());
@@ -184,7 +184,7 @@ void Layout::widgetDestroyed()
 
 bool Layout::prepareLayout(bool &needMove, bool &needReparent)
 {
-    for (QWidget *widget : qAsConst(m_widgets))
+    for (QWidget *widget : std::as_const(m_widgets))
         widget->raise();
 
     needMove = !m_layoutBase;
@@ -347,7 +347,7 @@ void Layout::breakLayout()
      * to grow (expanding widgets like QTextEdit), in which the geometry is
      * preserved. Note that historically, geometries were re-applied
      * only after breaking splitters. */
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         const QRect geom = w->geometry();
         const QSize sizeHint = w->sizeHint();
         const bool restoreGeometry = sizeHint.isEmpty() || sizeHint.width() > geom.width() || sizeHint.height() > geom.height();
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index c579d8a18..21ef81e3e 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -164,7 +164,7 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent
     if (m_deviceProfiles.isEmpty()) {
         m_ui->profileComboBox->setEnabled(false);
     } else {
-        for (const auto &deviceProfile : qAsConst(m_deviceProfiles))
+        for (const auto &deviceProfile : std::as_const(m_deviceProfiles))
             m_ui->profileComboBox->addItem(deviceProfile.name());
         const int ci = settings.currentDeviceProfileIndex();
         if (ci >= 0)
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 99d1c8c91..ca7363e98 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -628,7 +628,7 @@ void QDesignerPluginManager::updateRegisteredPlugins()
     if (debugPluginManager)
         qDebug() << Q_FUNC_INFO;
     m_d->m_registeredPlugins.clear();
-    for (const QString &path : qAsConst(m_d->m_pluginPaths))
+    for (const QString &path : std::as_const(m_d->m_pluginPaths))
         registerPath(path);
 }
 
@@ -638,7 +638,7 @@ bool QDesignerPluginManager::registerNewPlugins()
         qDebug() << Q_FUNC_INFO;
 
     const int before = m_d->m_registeredPlugins.size();
-    for (const QString &path : qAsConst(m_d->m_pluginPaths))
+    for (const QString &path : std::as_const(m_d->m_pluginPaths))
         registerPath(path);
     const bool newPluginsFound = m_d->m_registeredPlugins.size() > before;
     // We force a re-initialize as Jambi collection might return
@@ -709,7 +709,7 @@ void QDesignerPluginManager::ensureInitialized()
         for (QObject *o : staticPluginObjects)
             m_d->addCustomWidgets(o, staticPluginPath, designerLanguage);
     }
-    for (const QString &plugin : qAsConst(m_d->m_registeredPlugins)) {
+    for (const QString &plugin : std::as_const(m_d->m_registeredPlugins)) {
         if (QObject *o = instance(plugin))
             m_d->addCustomWidgets(o, plugin, designerLanguage);
     }
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index cbc8148b7..143f85194 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -119,7 +119,7 @@ PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::PreviewConfigurat
     Skins skins = defaultSkins();
     skins.push_front(SkinNamePath(PreviewConfigurationWidget::tr("None"), QString()));
 
-    for (const auto &skin : qAsConst(skins))
+    for (const auto &skin : std::as_const(skins))
         m_ui.m_skinCombo->addItem(skin.first, QVariant(skin.second));
     m_browseSkinIndex = m_firstUserSkinIndex = skins.size();
     m_ui.m_skinCombo->addItem(PreviewConfigurationWidget::tr("Browse..."), QString());
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 9d7d0da9a..270a5937b 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -600,7 +600,7 @@ void PromoteToCustomWidgetCommand::init(const WidgetPointerList &widgets,const Q
 
 void PromoteToCustomWidgetCommand::redo()
 {
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         if (w)
             promoteWidget(core(), w, m_customClassName);
     }
@@ -619,7 +619,7 @@ void PromoteToCustomWidgetCommand::updateSelection()
 
 void PromoteToCustomWidgetCommand::undo()
 {
-    for (QWidget *w : qAsConst(m_widgets)) {
+    for (QWidget *w : std::as_const(m_widgets)) {
         if (w)
             demoteWidget(core(), w);
     }
@@ -832,7 +832,7 @@ void BreakLayoutCommand::redo()
     m_layout->breakLayout();
     delete deco; // release the extension
 
-    for (QWidget *widget : qAsConst(m_widgets)) {
+    for (QWidget *widget : std::as_const(m_widgets)) {
         widget->resize(widget->size().expandedTo(QSize(16, 16)));
     }
     // Update unless we are in an intermediate state of morphing layout
@@ -2659,7 +2659,7 @@ void RemoveActionCommand::init(QAction *action)
 void RemoveActionCommand::redo()
 {
     QDesignerFormWindowInterface *fw = formWindow();
-    for (const ActionDataItem &item : qAsConst(m_actionData)) {
+    for (const ActionDataItem &item : std::as_const(m_actionData)) {
         item.widget->removeAction(m_action);
     }
     // Notify components (for example, signal slot editor)
@@ -2676,7 +2676,7 @@ void RemoveActionCommand::undo()
 {
     core()->actionEditor()->setFormWindow(formWindow());
     core()->actionEditor()->manageAction(m_action);
-    for (const ActionDataItem &item : qAsConst(m_actionData))
+    for (const ActionDataItem &item : std::as_const(m_actionData))
         item.widget->insertAction(item.before, m_action);
     if (!m_actionData.isEmpty())
         core()->objectInspector()->setFormWindow(formWindow());
diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
index 9b9c71a9b..4b838df9a 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -198,7 +198,7 @@ Qt::DropAction QDesignerMimeData::execDrag(const QDesignerDnDItems &items, QWidg
     const Qt::DropAction executedAction = drag->exec(Qt::CopyAction|Qt::MoveAction, mimeData->proposedDropAction());
 
     if (executedAction == Qt::IgnoreAction) {
-        for (QWidget *w : qAsConst(reshowWidgets))
+        for (QWidget *w : std::as_const(reshowWidgets))
             w->show();
     }
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index d3ad56c0f..c79cd6152 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -1393,7 +1393,7 @@ bool AddDynamicPropertyCommand::init(const QObjectList &selection, QObject *curr
 void AddDynamicPropertyCommand::redo()
 {
     QDesignerFormEditorInterface *core = formWindow()->core();
-    for (QObject *obj : qAsConst(m_selection)) {
+    for (QObject *obj : std::as_const(m_selection)) {
         QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core->extensionManager(), obj);
         dynamicSheet->addDynamicProperty(m_propertyName, m_value);
         if (QDesignerPropertyEditorInterface *propertyEditor = formWindow()->core()->propertyEditor()) {
@@ -1406,7 +1406,7 @@ void AddDynamicPropertyCommand::redo()
 void AddDynamicPropertyCommand::undo()
 {
     QDesignerFormEditorInterface *core = formWindow()->core();
-    for (QObject *obj : qAsConst(m_selection)) {
+    for (QObject *obj : std::as_const(m_selection)) {
         QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), obj);
         QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core->extensionManager(), obj);
         dynamicSheet->removeDynamicProperty(sheet->indexOf(m_propertyName));
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index b26b30d71..aa64e986c 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -204,7 +204,7 @@ void QSimpleResource::handleDomCustomWidgets(const QDesignerFormEditorInterface
     // Oops, there are classes left whose base class could not be found.
     // Default them to QWidget with warnings.
     const QString fallBackBaseClass = QStringLiteral("QWidget");
-    for (DomCustomWidget *custom_widget : qAsConst(custom_widget_list)) {
+    for (DomCustomWidget *custom_widget : std::as_const(custom_widget_list)) {
         const QString customClassName = custom_widget->elementClass();
         const QString base_class = custom_widget->elementExtends();
         qDebug() << "** WARNING The base class " << base_class << " of the custom widget class " << customClassName
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp
index 03e04de38..f24147cae 100644
--- a/src/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/src/designer/src/lib/shared/qtresourcemodel.cpp
@@ -310,7 +310,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     }
 
     if (!newResourceSetChanged && !needReregister && (m_currentResourceSet == resourceSet)) {
-        for (const QByteArray *data : qAsConst(toDelete))
+        for (const QByteArray *data : std::as_const(toDelete))
             deleteResource(data);
 
         return; // nothing changed
@@ -319,7 +319,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     if (needReregister)
         unregisterResourceSet(m_currentResourceSet);
 
-    for (const QByteArray *data : qAsConst(toDelete))
+    for (const QByteArray *data : std::as_const(toDelete))
         deleteResource(data);
 
     m_pathToData = newPathToData;
diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp
index 4a92af9cb..ccda74a76 100644
--- a/src/designer/src/lib/shared/rcc.cpp
+++ b/src/designer/src/lib/shared/rcc.cpp
@@ -571,7 +571,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
     if (parent->m_children.contains(filename)) {
-        for (const QString &fileName : qAsConst(m_fileNames)) {
+        for (const QString &fileName : std::as_const(m_fileNames)) {
             qWarning("%s: Warning: potential duplicate alias detected: '%s'",
                      qPrintable(fileName), qPrintable(filename));
         }
diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp
index e71fc65cf..2938045c1 100644
--- a/src/designer/src/lib/shared/selectsignaldialog.cpp
+++ b/src/designer/src/lib/shared/selectsignaldialog.cpp
@@ -91,7 +91,7 @@ static void appendClass(const QString &className, Methods methods, QStandardItem
     std::sort(methods.begin(), methods.end(), signatureLessThan);
     QStandardItem *topLevelItem = createTopLevelItem(className);
     model->appendRow(topLevelItem);
-    for (const SelectSignalDialog::Method &m : qAsConst(methods)) {
+    for (const SelectSignalDialog::Method &m : std::as_const(methods)) {
         QStandardItem *item = new QStandardItem(m.signature);
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
         item->setData(QVariant::fromValue(m), MethodRole);
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp
index 6e8ab41d2..f00966487 100644
--- a/src/designer/src/lib/shared/widgetdatabase.cpp
+++ b/src/designer/src/lib/shared/widgetdatabase.cpp
@@ -397,7 +397,7 @@ void WidgetDataBase::loadPlugins()
     unsigned addedPlugins = 0;
     unsigned removedPlugins = 0;
     if (!pluginList.isEmpty()) {
-        for (QDesignerWidgetDataBaseItemInterface *pluginItem : qAsConst(pluginList)) {
+        for (QDesignerWidgetDataBaseItemInterface *pluginItem : std::as_const(pluginList)) {
             const QString pluginName = pluginItem->name();
             NameIndexMap::iterator existingIt = existingCustomClasses.find(pluginName);
             if (existingIt == existingCustomClasses.end()) {
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 604a7f9d1..d4f30aab3 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1121,7 +1121,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
         }
     }
 
-    for (QObject *obj : qAsConst(children)) {
+    for (QObject *obj : std::as_const(children)) {
         if (QWidget *childWidget = qobject_cast<QWidget*>(obj)) {
             if (d->m_laidout.contains(childWidget) || !recursive)
                 continue;
@@ -1311,7 +1311,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout
 
     QList<DomLayoutItem *> ui_items;
     ui_items.reserve(newList.size());
-    for (const FormBuilderSaveLayoutEntry &item : qAsConst(newList)) {
+    for (const FormBuilderSaveLayoutEntry &item : std::as_const(newList)) {
         if (DomLayoutItem *ui_item = createDom(item.item, lay, ui_parentWidget)) {
             if (item.row >= 0)
                 ui_item->setAttributeRow(item.row);
@@ -1936,7 +1936,7 @@ void QAbstractFormBuilder::saveItemViewExtraInfo(const QAbstractItemView *itemVi
                 const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                                   + realPropertyName.mid(1);
                 const QString fakePropertyName = headerPrefix + upperPropertyName;
-                for (DomProperty *property : qAsConst(headerProperties)) {
+                for (DomProperty *property : std::as_const(headerProperties)) {
                     if (property->attributeName() == realPropertyName) {
                         property->setAttributeName(fakePropertyName);
                         viewProperties << property;
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 26fe09559..f27b8e96e 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -432,7 +432,7 @@ void QFormBuilder::updateCustomWidgets()
     d->m_customWidgets.clear();
 
 #if QT_CONFIG(library)
-    for (const QString &path : qAsConst(d->m_pluginPaths)) {
+    for (const QString &path : std::as_const(d->m_pluginPaths)) {
         const QDir dir(path);
         const QStringList candidates = dir.entryList(QDir::Files);
 
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index 9ba4c4302..fc1961aa9 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -744,7 +744,7 @@ QFormBuilderStrings::QFormBuilderStrings() :
     itemRoles.append(qMakePair(Qt::ForegroundRole, QString::fromLatin1("foreground")));
     itemRoles.append(qMakePair(Qt::CheckStateRole, QString::fromLatin1("checkState")));
 
-    for (const RoleNName &it : qAsConst(itemRoles))
+    for (const RoleNName &it : std::as_const(itemRoles))
         treeItemRoleHash.insert(it.second, it.first);
 
     itemTextRoles.append(qMakePair(qMakePair(Qt::EditRole, Qt::DisplayPropertyRole),