2 files changed, 15 insertions, 15 deletions

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);