Qt Designer: Remove foreach

Use range based for.

Change-Id: I61a51aad99a9b2a20263fa3fa5ed991ac899ff2e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

57 files changed, 334 insertions, 313 deletions

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 5c21af65c..feb07a60e 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -145,7 +145,7 @@ void BuddyEditor::updateBackground()
     m_updating = true;
     QList<Connection *> newList;
     const LabelList label_list = background()->findChildren<QLabel*>();
-    foreach (QLabel *label, label_list) {
+    for (QLabel *label : label_list) {
         const QString buddy_name = buddy(label, m_formWindow->core());
         if (buddy_name.isEmpty())
             continue;
@@ -182,7 +182,7 @@ void BuddyEditor::updateBackground()
     if (!toRemove.isEmpty()) {
         DeleteConnectionsCommand command(this, toRemove);
         command.redo();
-        foreach (Connection *con, toRemove)
+        for (Connection *con : qAsConst(toRemove))
             delete takeConnection(con);
     }
 
@@ -213,7 +213,7 @@ void BuddyEditor::setBackground(QWidget *background)
     ConnectionEdit::setBackground(background);
 
     const LabelList label_list = background->findChildren<QLabel*>();
-    foreach (QLabel *label, label_list) {
+    for (QLabel *label : label_list) {
         const QString buddy_name = buddy(label, m_formWindow->core());
         if (buddy_name.isEmpty())
             continue;
@@ -275,9 +275,9 @@ void BuddyEditor::widgetRemoved(QWidget *widget)
     child_list.prepend(widget);
 
     ConnectionSet remove_set;
-    foreach (QWidget *w, child_list) {
+    for (QWidget *w : qAsConst(child_list)) {
         const ConnectionList &cl = connectionList();
-        foreach (Connection *con, cl) {
+        for (Connection *con : cl) {
             if (con->widget(EndPoint::Source) == w || con->widget(EndPoint::Target) == w)
                 remove_set.insert(con, con);
         }
@@ -285,7 +285,7 @@ void BuddyEditor::widgetRemoved(QWidget *widget)
 
     if (!remove_set.isEmpty()) {
         undoStack()->beginMacro(tr("Remove buddies"));
-        foreach (Connection *con, remove_set) {
+        for (Connection *con : qAsConst(remove_set)) {
             setSelected(con, false);
             con->update();
             QWidget *source = con->widget(EndPoint::Source);
@@ -309,7 +309,7 @@ void BuddyEditor::deleteSelected()
         return;
 
     undoStack()->beginMacro(tr("Remove %n buddies", 0, selectedConnections.size()));
-    foreach (Connection *con, selectedConnections) {
+    for (Connection *con : selectedConnections) {
         setSelected(con, false);
         con->update();
         QWidget *source = con->widget(EndPoint::Source);
@@ -334,7 +334,7 @@ void BuddyEditor::autoBuddy()
     // Find already used buddies
     QWidgetList usedBuddies;
     const ConnectionList &beforeConnections = connectionList();
-    foreach (const Connection *c, beforeConnections)
+    for (const Connection *c : beforeConnections)
         usedBuddies.push_back(c->widget(EndPoint::Target));
     // Find potential new buddies, keep lists in sync
     QWidgetList buddies;
@@ -365,7 +365,7 @@ void BuddyEditor::autoBuddy()
     undoStack()->endMacro();
     // Now select all new ones
     const ConnectionList &connections = connectionList();
-    foreach (Connection *con, connections)
+    for (Connection *con : connections)
         setSelected(con, buddies.contains(con->widget(EndPoint::Target)));
 }
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index d969d6a54..562485c48 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -320,8 +320,8 @@ FormWindow::~FormWindow()
     core()->formWindowManager()->removeFormWindow(this);
     core()->metaDataBase()->remove(this);
 
-    QWidgetList l = widgets();
-    foreach (QWidget *w, l)
+    const QWidgetList &l = widgets();
+    for (QWidget *w : l)
         core()->metaDataBase()->remove(w);
 
     m_widgetStack = 0;
@@ -377,7 +377,7 @@ void FormWindow::setCursorToAll(const QCursor &c, QWidget *start)
 #ifndef QT_NO_CURSOR
     start->setCursor(c);
     const QWidgetList widgets = start->findChildren<QWidget*>();
-    foreach (QWidget *widget, widgets) {
+    for (QWidget *widget : widgets) {
         if (!qobject_cast<WidgetHandle*>(widget)) {
             widget->setCursor(c);
         }
@@ -688,7 +688,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
 
     QSet<QWidget*> widget_set;
 
-    foreach (QWidget *child, sel) { // Move parent layout or container?
+    for (QWidget *child : qAsConst(sel)) { // Move parent layout or container?
         QWidget *current = child;
 
         bool done = false;
@@ -724,7 +724,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
     const QPoint globalPos = mapToGlobal(m_startPos);
     const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ?
                             QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop;
-    foreach (QWidget *widget, sel) {
+    for (QWidget *widget : qAsConst(sel)) {
         item_list.append(new FormWindowDnDItem(dropType,  this, widget, globalPos));
         if (dropType == QDesignerDnDItemInterface::MoveDrop) {
             m_selection->hide(widget);
@@ -736,7 +736,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e)
 
     if (!sel.empty()) // reshow selection?
         if (QDesignerMimeData::execDrag(item_list, core()->topLevel()) == Qt::IgnoreAction && dropType == QDesignerDnDItemInterface::MoveDrop)
-            foreach (QWidget *widget, sel)
+            for (QWidget *widget : qAsConst(sel))
                 m_selection->show(widget);
 
     m_startPos = QPoint();
@@ -1510,7 +1510,7 @@ ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *f
 void ArrowKeyPropertyCommand::init(QWidgetList &l, const ArrowKeyOperation &op)
 {
     QObjectList ol;
-    foreach(QWidget *w, l)
+    for (QWidget *w : qAsConst(l))
         ol.push_back(w);
     SetPropertyCommand::init(ol, QStringLiteral("geometry"), QVariant::fromValue(op));
 
@@ -1585,7 +1585,7 @@ bool FormWindow::handleKeyReleaseEvent(QWidget *, QWidget *, QKeyEvent *e)
 void FormWindow::selectAll()
 {
     bool selectionChanged = false;
-    foreach (QWidget *widget, m_widgets) {
+    for (QWidget *widget : qAsConst(m_widgets)) {
         if (widget->isVisibleTo(this) && trySelectWidget(widget, true))
             selectionChanged = true;
     }
@@ -1861,7 +1861,7 @@ void FormWindow::paste(PasteMode pasteMode)
 
         if (widgetCount) {
             positionPastedWidgetsAtMousePosition(this,  m_contextMenuPosition, pasteContainer, clipboard.m_widgets);
-            foreach (QWidget *w, clipboard.m_widgets) {
+            for (QWidget *w : clipboard.m_widgets) {
                 InsertWidgetCommand *cmd = new InsertWidgetCommand(this);
                 cmd->init(w);
                 m_undoStack.push(cmd);
@@ -1870,7 +1870,7 @@ void FormWindow::paste(PasteMode pasteMode)
         }
 
         if (actionCount)
-            foreach (QAction *a, clipboard.m_actions) {
+            for (QAction *a : clipboard.m_actions) {
                 ensureUniqueObjectName(a);
                 AddActionCommand *cmd = new AddActionCommand(this);
                 cmd->init(a);
@@ -2028,7 +2028,7 @@ void FormWindow::raiseWidgets()
         return;
 
     beginCommand(tr("Raise widgets"));
-    foreach (QWidget *widget, widgets) {
+    for (QWidget *widget : qAsConst(widgets)) {
         RaiseWidgetCommand *cmd = new RaiseWidgetCommand(this);
         cmd->init(widget);
         m_undoStack.push(cmd);
@@ -2045,7 +2045,7 @@ void FormWindow::lowerWidgets()
         return;
 
     beginCommand(tr("Lower widgets"));
-    foreach (QWidget *widget, widgets) {
+    for (QWidget *widget : qAsConst(widgets)) {
         LowerWidgetCommand *cmd = new LowerWidgetCommand(this);
         cmd->init(widget);
         m_undoStack.push(cmd);
@@ -2209,7 +2209,7 @@ bool FormWindow::hasInsertedChildren(QWidget *widget) const // ### move
 
     const QWidgetList l = widgets(widget);
 
-    foreach (QWidget *child, l) {
+    for (QWidget *child : l) {
         if (isManaged(child) && !LayoutInfo::isWidgetLaidout(core(), child) && child->isVisibleTo(const_cast<FormWindow*>(this)))
             return true;
     }
@@ -2616,7 +2616,8 @@ void FormWindow::checkSelectionNow()
 {
     m_checkSelectionTimer->stop();
 
-    foreach (QWidget *widget, selectedWidgets()) {
+    const QWidgetList &sel = selectedWidgets();
+    for (QWidget *widget : sel) {
         updateSelection(widget);
 
         if (LayoutInfo::layoutType(core(), widget) != LayoutInfo::NoLayout)
@@ -2855,7 +2856,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list,
     QPoint offset;
     QDesignerDnDItemInterface *current = 0;
     QDesignerFormWindowCursorInterface *c = cursor();
-    foreach (QDesignerDnDItemInterface *item, item_list) {
+    for (QDesignerDnDItemInterface *item : qAsConst(item_list)) {
         QWidget *w = item->widget();
         if (!current)
             current = item;
@@ -2870,7 +2871,7 @@ bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list,
         offset = designerGrid().snapPoint(topLeft) - topLeft;
     }
 
-    foreach (QDesignerDnDItemInterface *item, item_list) {
+    for (QDesignerDnDItemInterface *item : qAsConst(item_list)) {
         DomUI *dom_ui = item->domUi();
         QRect geometry = item->decoration()->geometry();
         Q_ASSERT(dom_ui != 0);
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
index f915a697a..14642b770 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -113,7 +113,7 @@ void FormWindowWidgetStack::setSenderAsCurrentTool()
         return;
     }
 
-    foreach (QDesignerFormWindowToolInterface *t, m_tools) {
+    for (QDesignerFormWindowToolInterface *t : qAsConst(m_tools)) {
         if (action == t->action()) {
             tool = t;
             break;
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index acdad8d1e..efdada830 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -590,15 +590,13 @@ void FormWindowManager::slotActionBreakLayoutActivated()
 
     if (debugFWM) {
         qDebug() << "slotActionBreakLayoutActivated: " << layouts.size();
-        foreach (QWidget *w, layouts) {
+        for (const QWidget *w : layouts)
             qDebug() << w;
-        }
     }
 
     m_activeFormWindow->beginCommand(tr("Break Layout"));
-    foreach (QWidget *layout, layouts) {
+    for (QWidget *layout : layouts)
         m_activeFormWindow->breakLayout(layout);
-    }
     m_activeFormWindow->endCommand();
 }
 
@@ -632,7 +630,7 @@ void FormWindowManager::slotActionAdjustSizeActivated()
     }
 
     // Always count the main container as unlaid-out
-    foreach (QWidget *widget, selectedWidgets) {
+    for (QWidget *widget : qAsConst(selectedWidgets)) {
         bool unlaidout = LayoutInfo::layoutType(core(), widget->parentWidget()) == LayoutInfo::NoLayout;
         bool isMainContainer = m_activeFormWindow->isMainContainer(widget);
 
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
index 8f6761fe1..d8038a171 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -168,7 +168,8 @@ void ItemViewPropertySheet::initHeaderProperties(QHeaderView *hv, const QString
     QDesignerPropertySheetExtension *headerSheet = d->m_propertySheet.value(hv);
     Q_ASSERT(headerSheet);
     const QString headerGroupS = QLatin1String(headerGroup);
-    foreach (const QString &realPropertyName, d->realPropertyNames()) {
+    const QStringList &realPropertyNames = d->realPropertyNames();
+    for (const QString &realPropertyName : realPropertyNames) {
         const int headerIndex = headerSheet->indexOf(realPropertyName);
         Q_ASSERT(headerIndex != -1);
         const QVariant defaultValue = realPropertyName == QLatin1String(visibleProperty) ?
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index d45e1b9d3..5fa4ef698 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -521,7 +521,8 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget)
         const QString local = QStringLiteral("local");
         const QString global = QStringLiteral("global");
         QList<DomInclude*> ui_includes;
-        foreach (QString includeHint, m_formWindow->includeHints()) {
+        const QStringList &includeHints = m_formWindow->includeHints();
+        for (QString includeHint : includeHints) {
             if (includeHint.isEmpty())
                 continue;
             DomInclude *incl = new DomInclude;
@@ -655,7 +656,8 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
         if (DomIncludes *includes = ui->elementIncludes()) {
             const QString global = QStringLiteral("global");
             QStringList includeHints;
-            foreach (DomInclude *incl, includes->elementInclude()) {
+            const QList<DomInclude *> &elementInclude = includes->elementInclude();
+            for (DomInclude *incl : elementInclude) {
                 QString text = incl->text();
 
                 if (text.isEmpty())
@@ -710,11 +712,12 @@ QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
         const QList<DomProperty *> properties = ui->elementWidget()->elementProperty();
         if (!properties.empty()) {
             const QString geometry = QStringLiteral("geometry");
-            foreach (const DomProperty *p, properties)
+            for (const DomProperty *p : properties) {
                 if (p->attributeName() == geometry) {
                     hasExplicitGeometry = true;
                     break;
                 }
+            }
         }
         if (hasExplicitGeometry) {
             // Geometry was specified explicitly: Verify that smartMinSize is respected
@@ -787,7 +790,7 @@ QWidget *QDesignerResource::create(DomWidget *ui_widget, QWidget *parentWidget)
         menuBar->interactive(false);
     }
 
-    foreach (DomActionRef *ui_action_ref, actionRefs) {
+    for (DomActionRef *ui_action_ref : actionRefs) {
         const QString name = ui_action_ref->attributeName();
         if (name == QStringLiteral("separator")) {
             QAction *sep = new QAction(w);
@@ -1128,8 +1131,8 @@ DomWidget *QDesignerResource::createDom(QWidget *widget, DomWidget *ui_parentWid
         w->setAttributeName(widget->objectName());
         w->setAttributeClass(widgetInfo->name());
 
-        QList<DomProperty*> prop_list = w->elementProperty();
-        foreach (DomProperty *prop, prop_list) {
+        const QList<DomProperty*> &prop_list = w->elementProperty();
+        for (DomProperty *prop : prop_list) {
             if (prop->attributeName() == QStringLiteral("geometry")) {
                 if (DomRect *rect = prop->elementRect()) {
                     rect->setElementX(widget->x());
@@ -1222,7 +1225,8 @@ DomTabStops *QDesignerResource::saveTabStops()
     Q_ASSERT(item);
 
     QStringList tabStops;
-    foreach (QWidget *widget, item->tabOrder()) {
+    const QWidgetList &tabOrder = item->tabOrder();
+    for (QWidget *widget : tabOrder) {
         if (m_formWindow->mainContainer()->isAncestorOf(widget))
             tabStops.append(widget->objectName());
     }
@@ -1242,7 +1246,8 @@ void QDesignerResource::applyTabStops(QWidget *widget, DomTabStops *tabStops)
         return;
 
     QList<QWidget*> tabOrder;
-    foreach (const QString &widgetName, tabStops->elementTabStop()) {
+    const QStringList &elementTabStop = tabStops->elementTabStop();
+    for (const QString &widgetName : elementTabStop) {
         if (QWidget *w = widget->findChild<QWidget*>(widgetName)) {
             tabOrder.append(w);
         }
@@ -1686,9 +1691,10 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     // actions
     if (!selection.m_actions.empty()) {
         QList<DomAction*> domActions;
-        foreach(QAction* action, selection.m_actions)
+        for (QAction* action : qAsConst(selection.m_actions)) {
             if (DomAction *domAction = createDom(action))
                 domActions += domAction;
+        }
         if (!domActions.empty()) {
             ui_widget-> setElementAction(domActions);
             hasItems = true;
@@ -1726,7 +1732,7 @@ FormBuilderClipboard QDesignerResource::paste(DomUI *ui, QWidget *widgetParent,
     const QList<DomWidget*> domWidgets = topLevel->elementWidget();
     if (!domWidgets.empty()) {
         const QPoint offset = m_formWindow->grid();
-        foreach (DomWidget* domWidget, domWidgets) {
+        for (DomWidget* domWidget : domWidgets) {
             if (QWidget *w = create(domWidget, widgetParent)) {
                 w->move(w->pos() + offset);
                 // ### change the init properties of w
@@ -1735,10 +1741,10 @@ FormBuilderClipboard QDesignerResource::paste(DomUI *ui, QWidget *widgetParent,
         }
     }
     const QList<DomAction*> domActions = topLevel->elementAction();
-    if (!domActions.empty())
-        foreach (DomAction *domAction, domActions)
-            if (QAction *a = create(domAction, actionParent))
-                rc.m_actions .append(a);
+    for (DomAction *domAction : domActions) {
+        if (QAction *a = create(domAction, actionParent))
+            rc.m_actions .append(a);
+    }
 
     m_isMainWidget = saved;
 
@@ -1806,7 +1812,9 @@ DomCustomWidgets *QDesignerResource::saveCustomWidgets()
     OrderedDBIndexDomCustomWidgetMap orderedMap;
 
     const QString global = QStringLiteral("global");
-    foreach (QDesignerWidgetDataBaseItemInterface *item, m_usedCustomWidgets.keys()) {
+
+    for (auto it = m_usedCustomWidgets.cbegin(), end = m_usedCustomWidgets.cend(); it != end; ++it) {
+        QDesignerWidgetDataBaseItemInterface *item = it.key();
         const QString name = item->name();
         DomCustomWidget *custom_widget = new DomCustomWidget;
 
@@ -2017,7 +2025,7 @@ void QDesignerResource::createResources(DomResources *resources)
     QStringList paths;
     if (resources != 0) {
         const QList<DomResource*> dom_include = resources->elementInclude();
-        foreach (DomResource *res, dom_include) {
+        for (DomResource *res : dom_include) {
             QString path = QDir::cleanPath(m_formWindow->absoluteDir().absoluteFilePath(res->attributeLocation()));
             while (!QFile::exists(path)) {
                 QWidget *dialogParent = m_formWindow->core()->topLevel();
@@ -2086,7 +2094,7 @@ DomResources *QDesignerResource::saveResources(const QStringList &qrcPaths)
     QList<DomResource*> dom_include;
     if (resourceSet) {
         const QStringList activePaths = resourceSet->activeResourceFilePaths();
-        foreach (const QString &path, activePaths) {
+        for (const QString &path : activePaths) {
             if (qrcPaths.contains(path)) {
                 DomResource *dom_res = new DomResource;
                 QString conv_path = path;
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp
index 67f76c4bd..6aa2c9208 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -93,10 +93,9 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
             candidates.append(mw->layout());
             candidates += mw->layout()->findChildren<QLayout*>();
         }
-        foreach (QLayout *l, candidates) {
-            if (l->indexOf(me) != -1) {
+        for (QLayout *l : qAsConst(candidates)) {
+            if (l->indexOf(me) != -1)
                 return mw->dockWidgetArea(me);
-            }
         }
     }
     return Qt::LeftDockWidgetArea;
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
index 3e3fec0d3..05610f175 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -226,7 +226,7 @@ void WidgetEditorTool::detectDockDrag(const QDesignerMimeData *mimeData)
 
     const QList<QDesignerDnDItemInterface*> item_list = mimeData->items();
 
-    foreach (QDesignerDnDItemInterface *item, item_list) {
+    for (QDesignerDnDItemInterface *item : item_list) {
         if (item->decoration() && item->decoration()->property("_q_dockDrag").toBool())
             m_specialDockDrag = true;
 
@@ -335,8 +335,8 @@ void WidgetEditorTool::activated()
     if (m_formWindow == 0)
         return;
 
-    QList<QWidget*> sel = m_formWindow->selectedWidgets();
-    foreach (QWidget *w, sel)
+    const QList<QWidget*> &sel = m_formWindow->selectedWidgets();
+    for (QWidget *w : sel)
         m_formWindow->raiseSelection(w);
 }
 
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 0dd253bf5..50813f5e2 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -664,7 +664,7 @@ void ObjectInspector::ObjectInspectorPrivate::getSelection(Selection &s) const
         return;
 
     // sort objects
-    foreach (const QModelIndex &index, currentSelectedIndexes)
+    for (const QModelIndex &index : currentSelectedIndexes)
         if (QObject *object = m_model->objectAt(index))
             switch (selectionType(m_formWindow, object)) {
             case NoSelection:
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index cee91cd2c..080039ad9 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -466,7 +466,7 @@ namespace qdesigner_internal {
                 if (!changedObjects.contains(o)) {
                     changedObjects.insert(o);
                     const QModelIndexList indexes =  m_objectIndexMultiMap.values(o);
-                    foreach (const QModelIndex &index, indexes)
+                    for (const QModelIndex &index : indexes)
                         entry.setItemsDisplayData(rowAt(index), m_icons, changedMask);
                 }
             }
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 4c26e565c..e4a9b2a4d 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -1108,8 +1108,8 @@ void PropertyEditor::setObject(QObject *object)
 
                 property->setModified(m_propertySheet->isChanged(i));
                 if (propertyName == QStringLiteral("geometry") && type == QVariant::Rect) {
-                    QList<QtProperty *> subProperties = property->subProperties();
-                    foreach (QtProperty *subProperty, subProperties) {
+                    const QList<QtProperty *> &subProperties = property->subProperties();
+                    for (QtProperty *subProperty : subProperties) {
                         const QString subPropertyName = subProperty->propertyName();
                         if (subPropertyName == QStringLiteral("X") || subPropertyName == QStringLiteral("Y"))
                             subProperty->setEnabled(!isMainContainer);
diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils.cpp b/src/designer/src/components/signalsloteditor/signalslot_utils.cpp
index 0bc42e0e7..42c615245 100644
--- a/src/designer/src/components/signalsloteditor/signalslot_utils.cpp
+++ b/src/designer/src/components/signalsloteditor/signalslot_utils.cpp
@@ -94,7 +94,7 @@ static void memberList(QDesignerFormEditorInterface *core,
 
     const QStringList wdbFakeMethods = member_type == qdesigner_internal::SlotMember ? wdbItem->fakeSlots() : wdbItem->fakeSignals();
     if (!wdbFakeMethods.empty())
-        foreach (const QString &fakeMethod, wdbFakeMethods)
+        for (const QString &fakeMethod : wdbFakeMethods)
             if (predicate(fakeMethod)) {
                 *it = ClassNameSignaturePair(className, fakeMethod);
                 ++it;
@@ -107,7 +107,7 @@ static void memberList(QDesignerFormEditorInterface *core,
     if (const qdesigner_internal::MetaDataBaseItem *mdbItem = metaDataBase->metaDataBaseItem(object)) {
         const QStringList mdbFakeMethods =  member_type == qdesigner_internal::SlotMember ? mdbItem->fakeSlots() : mdbItem->fakeSignals();
         if (!mdbFakeMethods.empty())
-            foreach (const QString &fakeMethod, mdbFakeMethods)
+            for (const QString &fakeMethod : mdbFakeMethods)
                 if (predicate(fakeMethod)) {
                     *it = ClassNameSignaturePair(className, fakeMethod);
                     ++it;
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index c04329369..5ec3ed6ac 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -374,7 +374,7 @@ void SignalSlotEditor::fromUi(const DomConnections *connections, QWidget *parent
     setBackground(parent);
     clear();
     const QList<DomConnection*> list = connections->elementConnection();
-    foreach (const DomConnection *dom_con, list) {
+    for (const DomConnection *dom_con : list) {
         QObject *source = objectByName(parent, dom_con->elementSender());
         if (source == 0) {
             qDebug("SignalSlotEditor::fromUi(): no source widget called \"%s\"",
@@ -391,8 +391,8 @@ void SignalSlotEditor::fromUi(const DomConnections *connections, QWidget *parent
         QPoint sp = QPoint(20, 20), tp = QPoint(20, 20);
         const DomConnectionHints *dom_hints = dom_con->elementHints();
         if (dom_hints != 0) {
-            QList<DomConnectionHint*> list = dom_hints->elementHint();
-            foreach (DomConnectionHint *hint, list) {
+            const QList<DomConnectionHint*> &hints = dom_hints->elementHint();
+            for (DomConnectionHint *hint : hints) {
                 QString attr_type = hint->attributeType();
                 QPoint p = QPoint(hint->elementX(), hint->elementY());
                 if (attr_type == QStringLiteral("sourcelabel"))
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 6c8f3274f..0bb375fcf 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -624,12 +624,12 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent,
     switch (index.column()) {
     case 0:
     case 2:  { // object names
-        QStringList obj_name_list = objectNameList(m_form);
+        const QStringList &obj_name_list = objectNameList(m_form);
         QMap<QString, bool> markedNameList;
         markedNameList.insert(tr("<object>"), false);
         inline_editor->addTextList(markedNameList);
         markedNameList.clear();
-        foreach (const QString &name, obj_name_list)
+        for (const QString &name : obj_name_list)
             markedNameList.insert(name, false);
         inline_editor->addTextList(markedNameList);
     }
@@ -643,12 +643,12 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent,
         const qdesigner_internal::ClassesMemberFunctions class_list = qdesigner_internal::reverseClassesMemberFunctions(obj_name, type, peer, m_form);
 
         inline_editor->addText(type == qdesigner_internal::SignalMember ? tr("<signal>") : tr("<slot>"));
-        foreach (const qdesigner_internal::ClassMemberFunctions &classInfo, class_list) {
+        for (const qdesigner_internal::ClassMemberFunctions &classInfo : class_list) {
             if (classInfo.m_className.isEmpty() || classInfo.m_memberList.isEmpty())
                 continue;
             // Mark deprecated members by passing bool=true.
             QMap<QString, bool> markedMemberList;
-            foreach (const QString &member, classInfo.m_memberList)
+            for (const QString &member : qAsConst(classInfo.m_memberList))
                 markedMemberList.insert(member, false);
             inline_editor->addTitle(classInfo.m_className);
             inline_editor->addTextList(markedMemberList);
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index b82d166fc..a67006a39 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -241,7 +241,7 @@ void AbstractItemEditor::cacheReloaded()
 void AbstractItemEditor::updateBrowser()
 {
     BoolBlocker block(m_updatingBrowser);
-    foreach (QtVariantProperty *prop, m_properties) {
+    for (QtVariantProperty *prop : qAsConst(m_properties)) {
         int role = m_propertyToRole.value(prop);
         QVariant val = getItemData(role);
         if (!val.isValid()) {
@@ -256,9 +256,10 @@ void AbstractItemEditor::updateBrowser()
         prop->setValue(val);
     }
 
-    if (m_propertyBrowser->topLevelItems().isEmpty())
-        foreach (QtVariantProperty *prop, m_rootProperties)
+    if (m_propertyBrowser->topLevelItems().isEmpty()) {
+        for (QtVariantProperty *prop : qAsConst(m_rootProperties))
             m_propertyBrowser->addProperty(prop);
+    }
 }
 
 void AbstractItemEditor::injectPropertyBrowser(QWidget *parent, QWidget *widget)
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index 454e8883e..9cdb5a65d 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -138,7 +138,7 @@ QtVariantProperty *TreeWidgetEditor::setupPropertyGroup(const QString &title, Pr
 {
     setupProperties(propDefs);
     QtVariantProperty *groupProp = m_propertyManager->addProperty(QtVariantPropertyManager::groupTypeId(), title);
-    foreach (QtVariantProperty *prop, m_rootProperties)
+    for (QtVariantProperty *prop : qAsConst(m_rootProperties))
         groupProp->addSubProperty(prop);
     m_rootProperties.clear();
     return groupProp;
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 24a6b21fb..aad1689cc 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -125,7 +125,7 @@ static QSize geometryProp(const DomWidget *dw)
 {
     const QList<DomProperty*> prop_list = dw->elementProperty();
     const QString geometry = QStringLiteral("geometry");
-    foreach (DomProperty *prop, prop_list) {
+    for (DomProperty *prop : prop_list) {
         if (prop->attributeName() !=  geometry)
             continue;
         DomRect *dr = prop->elementRect();
@@ -142,14 +142,17 @@ static QSize domWidgetSize(const DomWidget *dw)
     if (size.isValid())
         return size;
 
-    foreach (const DomWidget *child, dw->elementWidget()) {
+    const QList<DomWidget*> &elementWidgets = dw->elementWidget();
+    for (const DomWidget *child : elementWidgets) {
         size = geometryProp(child);
         if (size.isValid())
             return size;
     }
 
-    foreach (const DomLayout *dl, dw->elementLayout()) {
-        foreach (DomLayoutItem *item, dl->elementItem()) {
+    const QList<DomLayout *> elementLayouts = dw->elementLayout();
+    for (const DomLayout *dl : elementLayouts) {
+        const QList<DomLayoutItem *> &elementItems = dl->elementItem();
+        for (DomLayoutItem *item : elementItems) {
             const DomWidget *child = item->elementWidget();
             if (child == 0)
                 continue;
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 4fa7222d0..0f75b6d45 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -314,7 +314,7 @@ bool WidgetBoxTreeWidget::loadContents(const QString &contents)
         return false;
     }
 
-    foreach(const Category &cat, cat_list)
+    for (const Category &cat : qAsConst(cat_list))
         addCategory(cat);
 
     addCustomCategories(false);
@@ -548,7 +548,7 @@ void WidgetBoxTreeWidget::writeCategories(QXmlStreamWriter &writer, const Catego
 
     writer.writeStartElement(widgetbox);
 
-    foreach (const Category &cat, cat_list) {
+    for (const Category &cat : cat_list) {
         writer.writeStartElement(category);
         writer.writeAttribute(name, cat.name());
         if (cat.type() == Category::Scratchpad)
@@ -583,7 +583,7 @@ void WidgetBoxTreeWidget::writeCategories(QXmlStreamWriter &writer, const Catego
 static int findCategory(const QString &name, const WidgetBoxTreeWidget::CategoryList &list)
 {
     int idx = 0;
-    foreach (const WidgetBoxTreeWidget::Category &cat, list) {
+    for (const WidgetBoxTreeWidget::Category &cat : list) {
         if (cat.name() == name)
             return idx;
         ++idx;
@@ -615,7 +615,7 @@ WidgetBoxTreeWidget::CategoryList WidgetBoxTreeWidget::loadCustomCategoryList()
     const QString invisible = QLatin1String(invisibleNameC);
     const QString iconPrefix = QLatin1String(iconPrefixC);
 
-    foreach(QDesignerCustomWidgetInterface *c, customWidgets) {
+    for (QDesignerCustomWidgetInterface *c : customWidgets) {
         const QString dom_xml = c->domXml();
         if (dom_xml.isEmpty())
             continue;
@@ -908,7 +908,7 @@ void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &i
     WidgetBoxCategoryListView *categoryView = 0;
     bool added = false;
 
-    foreach (QDesignerDnDItemInterface *item, item_list) {
+    for (QDesignerDnDItemInterface *item : item_list) {
         QWidget *w = item->widget();
         if (w == 0)
             continue;
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index ecf92b5c6..5e11f5b26 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -60,9 +60,7 @@ typedef QList<QAction *> ActionList;
 
 static void addActionsToToolBar(const ActionList &actions, QToolBar *t)
 {
-    const ActionList::const_iterator cend = actions.constEnd();
-    for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it) {
-        QAction *action = *it;
+    for (QAction *action : actions) {
         if (action->property(QDesignerActions::defaultToolbarPropertyName).toBool())
             t->addAction(action);
     }
@@ -197,9 +195,8 @@ bool DockedMdiArea::event(QEvent *event)
 
 static void addActionsToToolBarManager(const ActionList &al, const QString &title, QtToolBarManager *tbm)
 {
-    const ActionList::const_iterator cend = al.constEnd();
-    for (ActionList::const_iterator it = al.constBegin(); it != cend; ++it)
-        tbm->addAction(*it, title);
+    for (QAction *action : al)
+        tbm->addAction(action, title);
 }
 
 ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
@@ -222,7 +219,7 @@ ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
 
     m_manager->setMainWindow(configureableMainWindow);
 
-    foreach(QToolBar *tb, m_toolbars) {
+    for (QToolBar *tb : qAsConst(m_toolbars)) {
         const QString title = tb->windowTitle();
         m_manager->addToolBar(tb, title);
         addActionsToToolBarManager(tb->actions(), title, m_manager);
@@ -239,26 +236,15 @@ ToolBarManager::ToolBarManager(QMainWindow *configureableMainWindow,
     addActionsToToolBarManager(previewActions, tr("Style"), m_manager);
 
     const QString dockTitle = tr("Dock views");
-    foreach (QDesignerToolWindow *tw, toolWindows) {
+    for (QDesignerToolWindow *tw : toolWindows) {
         if (QAction *action = tw->action())
             m_manager->addAction(action, dockTitle);
     }
 
-    QString category(tr("File"));
-    foreach(QAction *action, actions->fileActions()->actions())
-        m_manager->addAction(action, category);
-
-    category = tr("Edit");
-    foreach(QAction *action, actions->editActions()->actions())
-        m_manager->addAction(action, category);
-
-    category = tr("Tools");
-    foreach(QAction *action, actions->toolActions()->actions())
-        m_manager->addAction(action, category);
-
-    category = tr("Form");
-    foreach(QAction *action, actions->formActions()->actions())
-        m_manager->addAction(action, category);
+    addActionsToToolBarManager(actions->fileActions()->actions(), tr("File"), m_manager);
+    addActionsToToolBarManager(actions->editActions()->actions(), tr("Edit"), m_manager);
+    addActionsToToolBarManager(actions->toolActions()->actions(), tr("Tools"), m_manager);
+    addActionsToToolBarManager(actions->formActions()->actions(), tr("Form"), m_manager);
 
     m_manager->addAction(m_configureAction, tr("Toolbars"));
     updateToolBarMenu();
@@ -277,7 +263,7 @@ void ToolBarManager::updateToolBarMenu()
     qStableSort(m_toolbars.begin(), m_toolbars.end(), toolBarTitleLessThan);
     // add to menu
     m_toolBarMenu->clear();
-    foreach (QToolBar *tb,  m_toolbars)
+    for (QToolBar *tb : qAsConst(m_toolbars))
         m_toolBarMenu->addAction(tb->toggleViewAction());
     m_toolBarMenu->addAction(m_configureAction);
 }
@@ -312,7 +298,7 @@ DockedMainWindow::DockedMainWindow(QDesignerWorkbench *wb,
     setWindowTitle(mainWindowTitle());
 
     const QList<QToolBar *> toolbars = createToolBars(wb->actionManager(), false);
-    foreach (QToolBar *tb, toolbars)
+    for (QToolBar *tb : toolbars)
         addToolBar(tb);
     DockedMdiArea *dma = new DockedMdiArea(wb->actionManager()->uiExtension());
     connect(dma, &DockedMdiArea::fileDropped,
@@ -367,7 +353,7 @@ QMdiSubWindow *DockedMainWindow::createMdiSubWindow(QWidget *fw, Qt::WindowFlags
 DockedMainWindow::DockWidgetList DockedMainWindow::addToolWindows(const DesignerToolWindowList &tls)
 {
     DockWidgetList rc;
-    foreach (QDesignerToolWindow *tw, tls) {
+    for (QDesignerToolWindow *tw : tls) {
         QDockWidget *dockWidget = new QDockWidget;
         dockWidget->setObjectName(tw->objectName() + QStringLiteral("_dock"));
         dockWidget->setWindowTitle(tw->windowTitle());
diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp
index bcf5434fc..51b61043d 100644
--- a/src/designer/src/designer/preferencesdialog.cpp
+++ b/src/designer/src/designer/preferencesdialog.cpp
@@ -49,7 +49,7 @@ PreferencesDialog::PreferencesDialog(QDesignerFormEditorInterface *core, QWidget
     m_optionsPages = core->optionsPages();
 
     m_ui->m_optionTabWidget->clear();
-    foreach (QDesignerOptionsPageInterface *optionsPage, m_optionsPages) {
+    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages)) {
         QWidget *page = optionsPage->createPage(this);
         m_ui->m_optionTabWidget->addTab(page, optionsPage->name());
         if (QDesignerAppearanceOptionsWidget *appearanceWidget = qobject_cast<QDesignerAppearanceOptionsWidget *>(page))
@@ -74,7 +74,7 @@ QPushButton *PreferencesDialog::applyButton() const
 
 void PreferencesDialog::slotApply()
 {
-    foreach (QDesignerOptionsPageInterface *optionsPage, m_optionsPages)
+    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages))
         optionsPage->apply();
 }
 
@@ -99,7 +99,7 @@ void PreferencesDialog::slotUiModeChanged(bool modified)
 
 void PreferencesDialog::closeOptionPages()
 {
-    foreach (QDesignerOptionsPageInterface *optionsPage, m_optionsPages)
+    for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages))
         optionsPage->finish();
 }
 
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index ae184caf7..3574f1751 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -349,9 +349,9 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     connect(formWindowManager, &QDesignerFormWindowManager::activeFormWindowChanged,
                 this, &QDesignerActions::activeFormWindowChanged);
 
-    QList<QObject*> builtinPlugins = QPluginLoader::staticInstances();
-    builtinPlugins += m_core->pluginManager()->instances();
-    foreach (QObject *plugin, builtinPlugins) {
+    const QObjectList builtinPlugins = QPluginLoader::staticInstances()
+        + m_core->pluginManager()->instances();
+    for (QObject *plugin : builtinPlugins) {
         if (QDesignerFormEditorPluginInterface *formEditorPlugin = qobject_cast<QDesignerFormEditorPluginInterface*>(plugin)) {
             if (QAction *action = formEditorPlugin->action()) {
                 m_toolActions->addAction(action);
@@ -607,7 +607,7 @@ bool QDesignerActions::openForm(QWidget *parent)
         return false;
 
     bool atLeastOne = false;
-    foreach (const QString &fileName, fileNames) {
+    for (const QString &fileName : fileNames) {
         if (readInForm(fileName) && !atLeastOne)
             atLeastOne = true;
     }
diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp
index d321f902a..87c206657 100644
--- a/src/designer/src/designer/qdesigner_server.cpp
+++ b/src/designer/src/designer/qdesigner_server.cpp
@@ -70,8 +70,7 @@ void QDesignerServer::sendOpenRequest(int port, const QStringList &files)
     sSocket->connectToHost(QHostAddress::LocalHost, port);
     if(sSocket->waitForConnected(3000))
     {
-        foreach(const QString &file, files)
-        {
+        for (const QString &file : files) {
             QFileInfo fi(file);
             sSocket->write(fi.absoluteFilePath().toUtf8() + '\n');
         }
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 493a4c0e1..b85b49c0b 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -270,21 +270,18 @@ void QDesignerWorkbench::saveGeometriesForModeChange()
         break;
     case TopLevelMode: {
         const QPoint desktopOffset = QApplication::desktop()->availableGeometry().topLeft();
-        foreach (QDesignerToolWindow *tw, m_toolWindows)
+        for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
             m_Positions.insert(tw, Position(tw, desktopOffset));
-        foreach (QDesignerFormWindow *fw, m_formWindows) {
+        for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
             m_Positions.insert(fw,  Position(fw, desktopOffset));
-        }
     }
         break;
     case DockedMode: {
         const QPoint mdiAreaOffset = m_dockedMainWindow->mdiArea()->pos();
-        foreach (QDesignerToolWindow *tw, m_toolWindows) {
+        for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
             m_Positions.insert(tw, Position(dockWidgetOf(tw)));
-        }
-        foreach (QDesignerFormWindow *fw, m_formWindows) {
+        for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
             m_Positions.insert(fw, Position(mdiSubWindowOf(fw), mdiAreaOffset));
-        }
     }
         break;
     }
@@ -374,12 +371,12 @@ void QDesignerWorkbench::switchToNeutralMode()
 
     m_mode = NeutralMode;
 
-    foreach (QDesignerToolWindow *tw, m_toolWindows) {
+    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows)) {
         tw->setCloseEventPolicy(MainWindowBase::AcceptCloseEvents);
         tw->setParent(0);
     }
 
-    foreach (QDesignerFormWindow *fw, m_formWindows) {
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
         fw->setParent(0);
         fw->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     }
@@ -432,7 +429,7 @@ void QDesignerWorkbench::switchToDockedMode()
 #endif
     qDesigner->setMainWindow(m_dockedMainWindow);
 
-    foreach (QDesignerFormWindow *fw, m_formWindows) {
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
         QMdiSubWindow *subwin = m_dockedMainWindow->createMdiSubWindow(fw, magicalWindowFlags(fw),
                                                                        m_actionManager->closeFormAction()->shortcut());
         subwin->hide();
@@ -452,7 +449,7 @@ void QDesignerWorkbench::adjustMDIFormPositions()
 {
     const QPoint mdiAreaOffset = m_dockedMainWindow->mdiArea()->pos();
 
-    foreach (QDesignerFormWindow *fw, m_formWindows) {
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
         const PositionMap::const_iterator pit = m_Positions.constFind(fw);
         if (pit != m_Positions.constEnd())
             pit->applyTo(mdiSubWindowOf(fw), mdiAreaOffset);
@@ -506,7 +503,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
     widgetBoxWrapper->restoreState(settings.mainWindowState(m_mode), MainWindowBase::settingsVersion());
 
     bool found_visible_window = false;
-    foreach (QDesignerToolWindow *tw, m_toolWindows) {
+    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows)) {
         tw->setParent(magicalParent(tw), magicalWindowFlags(tw));
         settings.restoreGeometry(tw, tw->geometryHint());
         tw->action()->setChecked(tw->isVisible());
@@ -518,7 +515,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
 
     m_actionManager->setBringAllToFrontVisible(true);
 
-    foreach (QDesignerFormWindow *fw, m_formWindows) {
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows)) {
         fw->setParent(magicalParent(fw), magicalWindowFlags(fw));
         fw->setAttribute(Qt::WA_DeleteOnClose, true);
         const PositionMap::const_iterator pit = m_Positions.constFind(fw);
@@ -628,7 +625,7 @@ void QDesignerWorkbench::initializeCorePlugins()
     QList<QObject*> plugins = QPluginLoader::staticInstances();
     plugins += core()->pluginManager()->instances();
 
-    foreach (QObject *plugin, plugins) {
+    for (QObject *plugin : qAsConst(plugins)) {
         if (QDesignerFormEditorPluginInterface *formEditorPlugin = qobject_cast<QDesignerFormEditorPluginInterface*>(plugin)) {
             if (!formEditorPlugin->isInitialized())
                 formEditorPlugin->initialize(core());
@@ -653,7 +650,7 @@ void QDesignerWorkbench::saveGeometries(QDesignerSettings &settings) const
     case TopLevelMode:
         settings.setToolBarsState(m_mode, m_topLevelData.toolbarManager->saveState(MainWindowBase::settingsVersion()));
         settings.setMainWindowState(m_mode, widgetBoxToolWindow()->saveState(MainWindowBase::settingsVersion()));
-        foreach (const QDesignerToolWindow *tw, m_toolWindows)
+        for (const QDesignerToolWindow *tw : m_toolWindows)
             settings.saveGeometryFor(tw);
         break;
     case NeutralMode:
@@ -683,7 +680,7 @@ bool QDesignerWorkbench::saveForm(QDesignerFormWindowInterface *frm)
 
 QDesignerFormWindow *QDesignerWorkbench::findFormWindow(QWidget *widget) const
 {
-    foreach (QDesignerFormWindow *formWindow, m_formWindows) {
+    for (QDesignerFormWindow *formWindow : m_formWindows) {
         if (formWindow->editor() == widget)
             return formWindow;
     }
@@ -695,7 +692,7 @@ bool QDesignerWorkbench::handleClose()
 {
     m_state = StateClosing;
     QList<QDesignerFormWindow *> dirtyForms;
-    foreach (QDesignerFormWindow *w, m_formWindows) {
+    for (QDesignerFormWindow *w : qAsConst(m_formWindows)) {
         if (w->editor()->isDirty())
             dirtyForms << w;
     }
@@ -722,7 +719,7 @@ bool QDesignerWorkbench::handleClose()
                 m_state = StateUp;
                 return false;
             case QMessageBox::Save:
-               foreach (QDesignerFormWindow *fw, dirtyForms) {
+               for (QDesignerFormWindow *fw : qAsConst(dirtyForms)) {
                    fw->show();
                    fw->raise();
                    if (!fw->close()) {
@@ -732,7 +729,7 @@ bool QDesignerWorkbench::handleClose()
                }
                break;
             case QMessageBox::Discard:
-              foreach (QDesignerFormWindow *fw, dirtyForms) {
+              for (QDesignerFormWindow *fw : qAsConst(dirtyForms)) {
                   fw->editor()->setDirty(false);
                   fw->setWindowModified(false);
               }
@@ -741,7 +738,7 @@ bool QDesignerWorkbench::handleClose()
         }
     }
 
-    foreach (QDesignerFormWindow *fw, m_formWindows)
+    for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
         fw->close();
 
     saveSettings();
@@ -799,7 +796,7 @@ void QDesignerWorkbench::formWindowActionTriggered(QAction *a)
 
 void QDesignerWorkbench::closeAllToolWindows()
 {
-    foreach (QDesignerToolWindow *tw, m_toolWindows)
+    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
         tw->hide();
 }
 
@@ -853,9 +850,9 @@ void QDesignerWorkbench::bringAllToFront()
 {
     if (m_mode !=  TopLevelMode)
         return;
-    foreach(QDesignerToolWindow *tw, m_toolWindows)
+    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
         raiseWindow(tw);
-    foreach(QDesignerFormWindow *dfw, m_formWindows)
+    for (QDesignerFormWindow *dfw : qAsConst(m_formWindows))
         raiseWindow(dfw);
 }
 
@@ -1092,7 +1089,7 @@ void QDesignerWorkbench::restoreUISettings()
     if (font == m_toolWindows.front()->font())
         return;
 
-    foreach(QDesignerToolWindow *tw, m_toolWindows)
+    for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
         tw->setFont(font);
 }
 
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 74c04b0a9..53846ba2a 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -100,14 +100,14 @@ void VersionLabel::mouseReleaseEvent(QMouseEvent *me)
         if (!secondStage) {
             m_path.lineTo(me->pos());
             bool gotIt = true;
-            foreach(const QPoint &pt, hitPoints) {
+            for (const QPoint &pt : qAsConst(hitPoints)) {
                 if (!m_path.contains(pt)) {
                     gotIt = false;
                     break;
                 }
             }
             if (gotIt) {
-                foreach(const QPoint &pt, missPoints) {
+                for (const QPoint &pt : qAsConst(missPoints)) {
                     if (m_path.contains(pt)) {
                         gotIt = false;
                         break;
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index b33225159..a31cb94ac 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -287,7 +287,7 @@ void ActionEditor::setFormWindow(QDesignerFormWindowInterface *formWindow)
 
     if (m_formWindow != 0) {
         const ActionList actionList = m_formWindow->mainContainer()->findChildren<QAction*>();
-        foreach (QAction *action, actionList)
+        for (QAction *action : actionList)
             disconnect(action, &QAction::changed, this, &ActionEditor::slotActionChanged);
     }
 
@@ -312,7 +312,7 @@ void ActionEditor::setFormWindow(QDesignerFormWindowInterface *formWindow)
     m_filterWidget->setEnabled(true);
 
     const ActionList actionList = formWindow->mainContainer()->findChildren<QAction*>();
-    foreach (QAction *action, actionList)
+    for (QAction *action : actionList)
         if (!action->isSeparator() && core()->metaDataBase()->item(action) != 0) {
             // Show unless it has a menu. However, listen for change on menu actions also as it might be removed
             if (!action->menu())
@@ -605,7 +605,7 @@ void ActionEditor::deleteActions(QDesignerFormWindowInterface *fw, const ActionL
     const QString description = actions.size() == 1 ?
         tr("Remove action '%1'").arg(actions.front()->objectName()) : tr("Remove actions");
     fw->beginCommand(description);
-    foreach(QAction *action, actions) {
+    for (QAction *action : actions) {
         RemoveActionCommand *cmd = new RemoveActionCommand(fw);
         cmd->init(action);
         fw->commandHistory()->push(cmd);
@@ -828,7 +828,7 @@ void ActionEditor::slotContextMenuRequested(QContextMenuEvent *e, QAction *item)
         const QWidgetList associatedWidgets = ActionModel::associatedWidgets(action);
         if (!associatedWidgets.empty()) {
             QMenu *associatedWidgetsSubMenu =  menu.addMenu(tr("Used In"));
-            foreach (QWidget *w, associatedWidgets) {
+            for (QWidget *w : associatedWidgets) {
                 associatedWidgetsSubMenu->addAction(w->objectName(),
                                                     this, [this, w] { this->slotSelectAssociatedWidget(w); });
             }
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index efe23d857..6ac1f7a87 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -230,7 +230,7 @@ QMimeData *ActionModel::mimeData(const QModelIndexList &indexes ) const
     ActionRepositoryMimeData::ActionList actionList;
 
     QSet<QAction*> actions;
-    foreach (const QModelIndex &index, indexes)
+    for (const QModelIndex &index : indexes)
         if (QStandardItem *item = itemFromIndex(index))
             if (QAction *action = actionOfItem(item))
                 actions.insert(action);
@@ -592,9 +592,11 @@ QItemSelection ActionView::selection() const
 ActionView::ActionList ActionView::selectedActions() const
 {
     ActionList rc;
-    foreach (const QModelIndex &index, selection().indexes())
+    const QModelIndexList &indexes = selection().indexes();
+    for (const QModelIndex &index : indexes) {
         if (index.column() == 0)
             rc += actionOfItem(m_model->itemFromIndex(index));
+    }
     return rc;
 }
 // ----------  ActionRepositoryMimeData
@@ -623,9 +625,11 @@ QPixmap  ActionRepositoryMimeData::actionDragPixmap(const QAction *action)
     if (!icon.isNull())
         return icon.pixmap(QSize(22, 22));
 
-    foreach (QWidget *w, action->associatedWidgets())
+    const QWidgetList &associatedWidgets = action->associatedWidgets();
+    for (QWidget *w : associatedWidgets) {
         if (QToolButton *tb = qobject_cast<QToolButton *>(w))
             return tb->grab(QRect(0, 0, -1, -1));
+    }
 
     // Create a QToolButton
     QToolButton *tb = new QToolButton;
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index 74b16452c..8f3b12ab2 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -205,7 +205,7 @@ DeleteConnectionsCommand::DeleteConnectionsCommand(ConnectionEdit *edit,
 
 void DeleteConnectionsCommand::redo()
 {
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : qAsConst(m_con_list)) {
         const int idx = edit()->indexOfConnection(con);
         emit edit()->aboutToRemoveConnection(con);
         Q_ASSERT(edit()->m_con_list.contains(con));
@@ -219,7 +219,7 @@ void DeleteConnectionsCommand::redo()
 
 void DeleteConnectionsCommand::undo()
 {
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : qAsConst(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);
@@ -987,7 +987,7 @@ void ConnectionEdit::updateBackground()
     if (!m_enable_update_background)
         return;
 
-    foreach(Connection *c, m_con_list)
+    for (Connection *c : qAsConst(m_con_list))
         c->updateVisibility();
 
     updateLines();
@@ -1065,7 +1065,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
 
     WidgetSet heavy_highlight_set, light_highlight_set;
 
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : qAsConst(m_con_list)) {
         if (!con->isVisible())
             continue;
 
@@ -1083,7 +1083,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    foreach (QWidget *w, heavy_highlight_set) {
+    for (QWidget *w : qAsConst(heavy_highlight_set)) {
         p.drawRect(fixRect(widgetRect(w)));
         light_highlight_set.remove(w);
     }
@@ -1093,23 +1093,22 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
     c.setAlpha(BG_ALPHA);
     p.setBrush(c);
 
-    foreach (QWidget *w, light_highlight_set)
+    for (QWidget *w : qAsConst(light_highlight_set))
         p.drawRect(fixRect(widgetRect(w)));
 
     p.setBrush(palette().color(QPalette::Base));
     p.setPen(palette().color(QPalette::Text));
-    foreach (Connection *con, m_con_list) {
-        if (!con->isVisible())
-            continue;
-
-        paintLabel(&p, EndPoint::Source, con);
-        paintLabel(&p, EndPoint::Target, con);
+    for (Connection *con : qAsConst(m_con_list)) {
+        if (con->isVisible()) {
+            paintLabel(&p, EndPoint::Source, con);
+            paintLabel(&p, EndPoint::Target, con);
+        }
     }
 
     p.setPen(m_active_color);
     p.setBrush(m_active_color);
 
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : qAsConst(m_con_list)) {
         if (!selected(con) || !con->isVisible())
             continue;
 
@@ -1428,7 +1427,7 @@ bool ConnectionEdit::selected(const Connection *con) const
 
 void ConnectionEdit::selectNone()
 {
-    foreach (Connection *con, m_sel_con_set)
+    for (Connection *con : qAsConst(m_sel_con_set))
         con->update();
 
     m_sel_con_set.clear();
@@ -1438,13 +1437,13 @@ void ConnectionEdit::selectAll()
 {
     if (m_sel_con_set.size() == m_con_list.size())
         return;
-    foreach (Connection *con, m_con_list)
+    for (Connection *con : qAsConst(m_con_list))
         setSelected(con, true);
 }
 
 Connection *ConnectionEdit::connectionAt(const QPoint &pos) const
 {
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : m_con_list) {
         if (con->contains(pos))
             return con;
     }
@@ -1453,7 +1452,7 @@ Connection *ConnectionEdit::connectionAt(const QPoint &pos) const
 
 CETypes::EndPoint ConnectionEdit::endPointAt(const QPoint &pos) const
 {
-    foreach (Connection *con, m_con_list) {
+    for (Connection *con : m_con_list) {
         if (!selected(con))
             continue;
         const QRect sr = con->endPointRect(EndPoint::Source);
@@ -1516,7 +1515,7 @@ void ConnectionEdit::addConnection(Connection *con)
 
 void ConnectionEdit::updateLines()
 {
-    foreach (Connection *con, m_con_list)
+    for (Connection *con : qAsConst(m_con_list))
         con->checkWidgets();
 }
 
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index d8f422a0a..ad1dc792e 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -446,7 +446,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list)
         tr("Delete '%1'").arg(widget_list.front()->objectName()) : tr("Delete");
 
     commandHistory()->beginMacro(description);
-    foreach (QWidget *w, widget_list) {
+    for (QWidget *w : qAsConst(widget_list)) {
         emit widgetRemoved(w);
         DeleteWidgetCommand *cmd = new DeleteWidgetCommand(this);
         cmd->init(w);
@@ -533,7 +533,8 @@ QStringList FormWindowBase::checkContents() const
     // Test for non-laid toplevel spacers, which will not be saved
     // as not to throw off uic.
     QStringList problems;
-    foreach (const Spacer *spacer, mainContainer()->findChildren<Spacer *>()) {
+    const auto &spacers = mainContainer()->findChildren<Spacer *>();
+    for (const Spacer *spacer : spacers) {
         if (spacer->parentWidget() && !spacer->parentWidget()->layout()) {
             problems.push_back(tr("<p>This file contains top level spacers.<br/>"
                                   "They will <b>not</b> be saved.</p><p>"
diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp
index 6af620372..030e3c9e9 100644
--- a/src/designer/src/lib/shared/iconloader.cpp
+++ b/src/designer/src/lib/shared/iconloader.cpp
@@ -38,7 +38,7 @@ namespace qdesigner_internal {
 
 QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 {
-    QStringList candidates = QStringList()
+    const QStringList candidates = QStringList()
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/") + name)
 #ifdef Q_OS_MACOS
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/mac/") + name)
@@ -47,7 +47,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 #endif
         << (QString::fromUtf8(":/qt-project.org/formeditor/images/designer_") + name);
 
-    foreach (const QString &f, candidates) {
+    for (const QString &f : candidates) {
         if (QFile::exists(f))
             return QIcon(f);
     }
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp
index 29ada62f9..9c1c4c357 100644
--- a/src/designer/src/lib/shared/layout.cpp
+++ b/src/designer/src/lib/shared/layout.cpp
@@ -143,7 +143,7 @@ void Layout::setup()
     // Widgets which are already laid out are thrown away here too
 
     QMultiMap<QWidget*, QWidget*> lists;
-    foreach (QWidget *w, m_widgets) {
+    for (QWidget *w : qAsConst(m_widgets)) {
         QWidget *p = w->parentWidget();
 
         if (p && LayoutInfo::layoutType(m_formWindow->core(), p) != LayoutInfo::NoLayout
@@ -154,12 +154,10 @@ void Layout::setup()
     }
 
     QWidgetList lastList;
-    QWidgetList parents = lists.keys();
-    foreach (QWidget *p, parents) {
-        QWidgetList children = lists.values(p);
-
-        if (children.count() > lastList.count())
-            lastList = children;
+    const QWidgetList &parents = lists.keys();
+    for (QWidget *p : parents) {
+        if (lists.count(p) > lastList.count())
+            lastList = lists.values(p);
     }
 
 
@@ -189,7 +187,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
-    foreach (QWidget *w, m_widgets) {
+    for (QWidget *w : qAsConst(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());
@@ -214,9 +212,8 @@ void Layout::widgetDestroyed()
 
 bool Layout::prepareLayout(bool &needMove, bool &needReparent)
 {
-    foreach (QWidget *widget, m_widgets) {
+    for (QWidget *widget : qAsConst(m_widgets))
         widget->raise();
-    }
 
     needMove = !m_layoutBase;
     needReparent = needMove || (m_reparentLayoutWidget && qobject_cast<QLayoutWidget*>(m_layoutBase)) || qobject_cast<QSplitter*>(m_layoutBase);
@@ -375,7 +372,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. */
-    foreach (QWidget *w, m_widgets) {
+    for (QWidget *w : qAsConst(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/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp
index 1d948aee6..32294daa3 100644
--- a/src/designer/src/lib/shared/plugindialog.cpp
+++ b/src/designer/src/lib/shared/plugindialog.cpp
@@ -93,7 +93,7 @@ void PluginDialog::populateTreeWidget()
         QTreeWidgetItem *topLevelItem = setTopLevelItem(tr("Loaded Plugins"));
         QFont boldFont = topLevelItem->font(0);
 
-        foreach (const QString &fileName, fileNames) {
+        for (const QString &fileName : fileNames) {
             QPluginLoader loader(fileName);
             const QFileInfo fileInfo(fileName);
 
@@ -101,7 +101,8 @@ void PluginDialog::populateTreeWidget()
 
             if (QObject *plugin = loader.instance()) {
                 if (const QDesignerCustomWidgetCollectionInterface *c = qobject_cast<QDesignerCustomWidgetCollectionInterface*>(plugin)) {
-                    foreach (const QDesignerCustomWidgetInterface *p, c->customWidgets())
+                    const QList<QDesignerCustomWidgetInterface *> &collCustomWidgets = c->customWidgets();
+                    for (const QDesignerCustomWidgetInterface *p : collCustomWidgets)
                         setItem(pluginItem, p->name(), p->toolTip(), p->whatsThis(), p->icon());
                 } else {
                     if (const QDesignerCustomWidgetInterface *p = qobject_cast<QDesignerCustomWidgetInterface*>(plugin))
@@ -115,7 +116,7 @@ void PluginDialog::populateTreeWidget()
     if (!notLoadedPlugins.isEmpty()) {
         QTreeWidgetItem *topLevelItem = setTopLevelItem(tr("Failed Plugins"));
         const QFont boldFont = topLevelItem->font(0);
-        foreach (const QString &plugin, notLoadedPlugins) {
+        for (const QString &plugin : notLoadedPlugins) {
             const QString failureReason = pluginManager->failureReason(plugin);
             QTreeWidgetItem *pluginItem = setPluginItem(topLevelItem, plugin, boldFont);
             setItem(pluginItem, failureReason, failureReason, QString(), QIcon());
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 35d916bdc..1a13aa5c3 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -101,7 +101,7 @@ QStringList QDesignerPluginManager::defaultPluginPaths()
     const QStringList path_list = QCoreApplication::libraryPaths();
 
     const QString designer = QStringLiteral("designer");
-    foreach (const QString &path, path_list) {
+    for (const QString &path : path_list) {
         QString libPath = path;
         libPath += QDir::separator();
         libPath += designer;
@@ -546,7 +546,8 @@ void QDesignerPluginManagerPrivate::addCustomWidgets(const QObject *o,
         return;
     }
     if (const QDesignerCustomWidgetCollectionInterface *coll = qobject_cast<QDesignerCustomWidgetCollectionInterface*>(o)) {
-        foreach(QDesignerCustomWidgetInterface *c, coll->customWidgets())
+        const QList<QDesignerCustomWidgetInterface *> &collCustomWidgets = coll->customWidgets();
+        for (QDesignerCustomWidgetInterface *c : collCustomWidgets)
             addCustomWidget(c, pluginPath, designerLanguage);
     }
 }
@@ -663,7 +664,7 @@ void QDesignerPluginManager::updateRegisteredPlugins()
     if (debugPluginManager)
         qDebug() << Q_FUNC_INFO;
     m_d->m_registeredPlugins.clear();
-    foreach (const QString &path,  m_d->m_pluginPaths)
+    for (const QString &path : qAsConst(m_d->m_pluginPaths))
         registerPath(path);
 }
 
@@ -673,7 +674,7 @@ bool QDesignerPluginManager::registerNewPlugins()
         qDebug() << Q_FUNC_INFO;
 
     const int before = m_d->m_registeredPlugins.size();
-    foreach (const QString &path, m_d->m_pluginPaths)
+    for (const QString &path : qAsConst(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
@@ -688,9 +689,8 @@ void QDesignerPluginManager::registerPath(const QString &path)
 {
     if (debugPluginManager)
         qDebug() << Q_FUNC_INFO << path;
-    QStringList candidates = findPlugins(path);
-
-    foreach (const QString &plugin, candidates)
+    const QStringList &candidates = findPlugins(path);
+    for (const QString &plugin : candidates)
         registerPlugin(plugin);
 }
 
@@ -742,12 +742,13 @@ void QDesignerPluginManager::ensureInitialized()
     const QObjectList staticPluginObjects = QPluginLoader::staticInstances();
     if (!staticPluginObjects.empty()) {
         const QString staticPluginPath = QCoreApplication::applicationFilePath();
-        foreach(QObject *o, staticPluginObjects)
+        for (QObject *o : staticPluginObjects)
             m_d->addCustomWidgets(o, staticPluginPath, designerLanguage);
     }
-    foreach (const QString &plugin, m_d->m_registeredPlugins)
+    for (const QString &plugin : qAsConst(m_d->m_registeredPlugins)) {
         if (QObject *o = instance(plugin))
             m_d->addCustomWidgets(o, plugin, designerLanguage);
+    }
 
     m_d->m_initialized = true;
 }
@@ -777,10 +778,10 @@ QDesignerCustomWidgetData QDesignerPluginManager::customWidgetData(const QString
 
 QObjectList QDesignerPluginManager::instances() const
 {
-    QStringList plugins = registeredPlugins();
+    const QStringList &plugins = registeredPlugins();
 
     QObjectList lst;
-    foreach (const QString &plugin, plugins) {
+    for (const QString &plugin : plugins) {
         if (QObject *o = instance(plugin))
             lst.append(o);
     }
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 335b4ecab..939135c75 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -630,7 +630,7 @@ void PromoteToCustomWidgetCommand::init(const WidgetList &widgets,const QString
 
 void PromoteToCustomWidgetCommand::redo()
 {
-    foreach (QWidget *w, m_widgets) {
+    for (QWidget *w : qAsConst(m_widgets)) {
         if (w)
             promoteWidget(core(), w, m_customClassName);
     }
@@ -649,7 +649,7 @@ void PromoteToCustomWidgetCommand::updateSelection()
 
 void PromoteToCustomWidgetCommand::undo()
 {
-    foreach (QWidget *w, m_widgets) {
+    for (QWidget *w : qAsConst(m_widgets)) {
         if (w)
             demoteWidget(core(), w);
     }
@@ -864,7 +864,7 @@ void BreakLayoutCommand::redo()
     m_layout->breakLayout();
     delete deco; // release the extension
 
-    foreach (QWidget *widget, m_widgets) {
+    for (QWidget *widget : qAsConst(m_widgets)) {
         widget->resize(widget->size().expandedTo(QSize(16, 16)));
     }
     // Update unless we are in an intermediate state of morphing layout
@@ -2297,7 +2297,7 @@ QTreeWidgetItem *ListContents::createTreeItem(DesignerIconCache *iconCache) cons
 {
     QTreeWidgetItem *item = new QTreeWidgetItem;
     int i = 0;
-    foreach (const ItemData &id, m_items)
+    for (const ItemData &id : m_items)
         id.fillTreeItemColumn(item, i++, iconCache);
     return item;
 }
@@ -2315,7 +2315,7 @@ void ListContents::applyToListWidget(QListWidget *listWidget, DesignerIconCache
     listWidget->clear();
 
     int i = 0;
-    foreach (const ItemData &entry, m_items) {
+    for (const ItemData &entry : m_items) {
         if (!entry.isValid())
             new QListWidgetItem(TableWidgetContents::defaultHeaderText(i), listWidget);
         else
@@ -2348,7 +2348,7 @@ void ListContents::applyToComboBox(QComboBox *comboBox, DesignerIconCache *iconC
 {
     comboBox->clear();
 
-    foreach (const ItemData &hash, m_items) {
+    for (const ItemData &hash : m_items) {
         QIcon icon;
         if (iconCache)
             icon = iconCache->icon(qvariant_cast<PropertySheetIconValue>(
@@ -2448,14 +2448,14 @@ void TableWidgetContents::applyToTableWidget(QTableWidget *tableWidget, Designer
 
     // horiz header
     int col = 0;
-    foreach (const ItemData &id, m_horizontalHeader.m_items) {
+    for (const ItemData &id : m_horizontalHeader.m_items) {
         if (id.isValid())
             tableWidget->setHorizontalHeaderItem(col, id.createTableItem(iconCache, editor));
         col++;
     }
     // vertical header
     int row = 0;
-    foreach (const ItemData &id, m_verticalHeader.m_items) {
+    for (const ItemData &id : m_verticalHeader.m_items) {
         if (id.isValid())
             tableWidget->setVerticalHeaderItem(row, id.createTableItem(iconCache, editor));
         row++;
@@ -2537,7 +2537,7 @@ QTreeWidgetItem *TreeWidgetContents::ItemContents::createTreeItem(DesignerIconCa
             item->setFlags((Qt::ItemFlags)m_itemFlags);
     }
 
-    foreach (const ItemContents &ic, m_children)
+    for (const ItemContents &ic : m_children)
         item->addChild(ic.createTreeItem(iconCache, editor));
 
     return item;
@@ -2571,7 +2571,7 @@ void TreeWidgetContents::applyToTreeWidget(QTreeWidget *treeWidget, DesignerIcon
 
     treeWidget->setColumnCount(m_headerItem.m_items.count());
     treeWidget->setHeaderItem(m_headerItem.createTreeItem(iconCache));
-    foreach (const ItemContents &ic, m_rootItems)
+    for (const ItemContents &ic : m_rootItems)
         treeWidget->addTopLevelItem(ic.createTreeItem(iconCache, editor));
     treeWidget->expandAll();
 }
@@ -2694,7 +2694,8 @@ static RemoveActionCommand::ActionData findActionIn(QAction *action)
 {
     RemoveActionCommand::ActionData result;
     // We only want menus and toolbars, no toolbuttons.
-    foreach (QWidget *widget, action->associatedWidgets())
+    const QWidgetList &associatedWidgets = action->associatedWidgets();
+    for (QWidget *widget : associatedWidgets) {
         if (qobject_cast<const QMenu *>(widget) || qobject_cast<const QToolBar *>(widget)) {
             const QList<QAction*> actionList = widget->actions();
             const int size = actionList.size();
@@ -2708,6 +2709,7 @@ static RemoveActionCommand::ActionData findActionIn(QAction *action)
                 }
             }
         }
+    }
     return result;
 }
 
@@ -2722,7 +2724,7 @@ void RemoveActionCommand::init(QAction *action)
 void RemoveActionCommand::redo()
 {
     QDesignerFormWindowInterface *fw = formWindow();
-    foreach (const ActionDataItem &item, m_actionData) {
+    for (const ActionDataItem &item : qAsConst(m_actionData)) {
         item.widget->removeAction(m_action);
     }
     // Notify components (for example, signal slot editor)
@@ -2739,9 +2741,8 @@ void RemoveActionCommand::undo()
 {
     core()->actionEditor()->setFormWindow(formWindow());
     core()->actionEditor()->manageAction(m_action);
-    foreach (const ActionDataItem &item, m_actionData) {
+    for (const ActionDataItem &item : qAsConst(m_actionData))
         item.widget->insertAction(item.before, m_action);
-    }
     if (!m_actionData.empty())
         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 baa278660..1bb50e8a2 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp
+++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp
@@ -222,9 +222,10 @@ Qt::DropAction QDesignerMimeData::execDrag(const QDesignerDnDItems &items, QWidg
 
     const Qt::DropAction executedAction = drag->exec(Qt::CopyAction|Qt::MoveAction, mimeData->proposedDropAction());
 
-    if (executedAction == Qt::IgnoreAction && !reshowWidgets.empty())
-        foreach (QWidget *w, reshowWidgets)
+    if (executedAction == Qt::IgnoreAction) {
+        for (QWidget *w : qAsConst(reshowWidgets))
             w->show();
+    }
 
     return executedAction;
 }
@@ -251,10 +252,9 @@ void QDesignerMimeData::removeMovedWidgetsFromSourceForm(const QDesignerDnDItems
             if (QWidget *w = (*it)->widget())
                 if (FormWindowBase *fb = qobject_cast<FormWindowBase *>((*it)->source()))
                     formWidgetMap.insert(fb, w);
-    if (formWidgetMap.empty())
-        return;
 
-    foreach (FormWindowBase * fb, formWidgetMap.keys())
+    const QList<FormWindowBase *> &formWindows = formWidgetMap.uniqueKeys();
+    for (FormWindowBase *fb : formWindows)
         fb->deleteWidgetList(formWidgetMap.values(fb));
 }
 
diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
index 8a595481d..a809ab4af 100644
--- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -301,7 +301,7 @@ void QDesignerFormBuilder::createResources(DomResources *resources)
     QStringList paths;
     if (resources != 0) {
         const QList<DomResource*> dom_include = resources->elementInclude();
-        foreach (DomResource *res, dom_include) {
+        for (DomResource *res : dom_include) {
             QString path = QDir::cleanPath(workingDirectory().absoluteFilePath(res->attributeLocation()));
             paths << path;
         }
diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index f6e2b7736..52bd047c5 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -569,7 +569,8 @@ void QDesignerMenu::paintEvent(QPaintEvent *event)
 
     QAction *current = currentAction();
 
-    foreach (QAction *a, actions()) {
+    const QList<QAction *> &actionList = actions();
+    for (QAction *a : actionList) {
         const QRect g = actionGeometry(a);
 
         if (qobject_cast<SpecialMenuAction*>(a)) {
@@ -851,9 +852,9 @@ void QDesignerMenu::closeMenuChain()
         w = w->parentWidget();
 
     if (w) {
-        foreach (QMenu *subMenu, w->findChildren<QMenu*>()) {
+        const QList<QMenu *> &menus = w->findChildren<QMenu *>();
+        for (QMenu *subMenu : menus)
             subMenu->hide();
-        }
     }
 
     m_lastSubMenuIndex = -1;
@@ -1027,7 +1028,8 @@ QDesignerMenu *QDesignerMenu::findOrCreateSubMenu(QAction *action)
 
 bool QDesignerMenu::canCreateSubMenu(QAction *action) const // ### improve it's a bit too slow
 {
-    foreach (const QWidget *aw, action->associatedWidgets())
+    const QWidgetList &associatedWidgets = action->associatedWidgets();
+    for (const QWidget *aw : associatedWidgets) {
         if (aw != this) {
             if (const QMenu *m = qobject_cast<const QMenu *>(aw)) {
                 if (m->actions().contains(action))
@@ -1038,6 +1040,7 @@ bool QDesignerMenu::canCreateSubMenu(QAction *action) const // ### improve it's
                         return false; // sorry
             }
         }
+    }
     return true;
 }
 
@@ -1306,9 +1309,9 @@ QAction *QDesignerMenu::safeActionAt(int index) const
 void QDesignerMenu::hideSubMenu()
 {
     m_lastSubMenuIndex = -1;
-    foreach (QMenu *subMenu, findChildren<QMenu*>()) {
+    const QList<QMenu *> &menus = findChildren<QMenu *>();
+    for (QMenu *subMenu : menus)
         subMenu->hide();
-    }
 }
 
 void QDesignerMenu::deleteAction()
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index a3a84b79c..c00dea3fd 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -117,7 +117,8 @@ void QDesignerMenuBar::paintEvent(QPaintEvent *event)
 
     QPainter p(this);
 
-    foreach (QAction *a, actions()) {
+    const auto &actionList = actions();
+    for (QAction *a : actionList) {
         if (qobject_cast<SpecialMenuAction*>(a)) {
             const QRect g = actionGeometry(a);
             QLinearGradient lg(g.left(), g.top(), g.left(), g.bottom());
diff --git a/src/designer/src/lib/shared/qdesigner_objectinspector.cpp b/src/designer/src/lib/shared/qdesigner_objectinspector.cpp
index 3c7a55eb6..e07504259 100644
--- a/src/designer/src/lib/shared/qdesigner_objectinspector.cpp
+++ b/src/designer/src/lib/shared/qdesigner_objectinspector.cpp
@@ -56,9 +56,9 @@ bool Selection::empty() const
 QObjectList Selection::selection() const
 {
     QObjectList rc(objects);
-    foreach (QObject* o, managed)
+    for (QObject *o : managed)
         rc.push_back(o);
-    foreach (QObject* o, unmanaged)
+    for (QObject *o : unmanaged)
         rc.push_back(o);
     return rc;
 }
diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp
index 61c7675cf..13f055ae2 100644
--- a/src/designer/src/lib/shared/qdesigner_promotion.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp
@@ -341,7 +341,8 @@ namespace qdesigner_internal {
         // Change the name in the data base and change all referencing objects in the meta database
         dbItem->setName(newClassName);
         bool foundReferences = false;
-        foreach (QObject* object, metaDataBase->objects()) {
+        const QObjectList &dbObjects = metaDataBase->objects();
+        for (QObject* object : dbObjects) {
             MetaDataBaseItem *item =  metaDataBase->metaDataBaseItem(object);
             Q_ASSERT(item);
             if (item->customClassName() == oldclassName) {
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index b6e83b59d..bce74ecb0 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -1005,7 +1005,7 @@ bool PropertyListCommand::initList(const ObjectList &list, const QString &aprope
         if (!add(referenceObject, apropertyName))
             return false;
     }
-    foreach (QObject *o, list) {
+    for (QObject *o : list) {
         if (o != referenceObject)
             add(o, apropertyName);
     }
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
index 8cf7ce564..f0d40161c 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
@@ -653,7 +653,7 @@ void QDesignerTaskMenu::navigateToSlot(QDesignerFormEditorInterface *core,
         qdesigner_internal::MetaDataBaseItem *item = metaDataBase->metaDataBaseItem(object);
         Q_ASSERT(item);
         const QStringList fakeSignals = item->fakeSignals();
-        foreach (const QString &fakeSignal, fakeSignals)
+        for (const QString &fakeSignal : fakeSignals)
             classToSignalList[item->customClassName()][fakeSignal] = QStringList();
     }
 
@@ -665,7 +665,7 @@ void QDesignerTaskMenu::navigateToSlot(QDesignerFormEditorInterface *core,
             if (index >= 0) {
                 WidgetDataBaseItem* item = static_cast<WidgetDataBaseItem*>(db->item(index));
                 const QStringList fakeSignals = item->fakeSignals();
-                foreach (const QString &fakeSignal, fakeSignals)
+                for (const QString &fakeSignal : fakeSignals)
                     classToSignalList[promotedClassName][fakeSignal] = QStringList();
             }
         }
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index 301b23722..aba6fc7da 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -157,13 +157,15 @@ bool QSimpleResource::addFakeMethods(const DomSlots *domSlots, QStringList &fake
         return false;
 
     bool rc = false;
-    foreach (const QString &fakeSlot, domSlots->elementSlot())
+    const QStringList &elementSlots = domSlots->elementSlot();
+    for (const QString &fakeSlot : elementSlots)
         if (fakeSlots.indexOf(fakeSlot) == -1) {
             fakeSlots += fakeSlot;
             rc = true;
         }
 
-    foreach (const QString &fakeSignal, domSlots->elementSignal())
+    const QStringList &elementSignals = domSlots->elementSignal();
+    for (const QString &fakeSignal : elementSignals)
         if (fakeSignals.indexOf(fakeSignal) == -1) {
             fakeSignals += fakeSignal;
             rc = true;
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp
index bd120c542..92c15cd36 100644
--- a/src/designer/src/lib/shared/qtresourcemodel.cpp
+++ b/src/designer/src/lib/shared/qtresourcemodel.cpp
@@ -343,7 +343,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     }
 
     if (!newResourceSetChanged && !needReregister && (m_currentResourceSet == resourceSet)) {
-        foreach (const QByteArray *data, toDelete)
+        for (const QByteArray *data : qAsConst(toDelete))
             deleteResource(data);
 
         return; // nothing changed
@@ -352,7 +352,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL
     if (needReregister)
         unregisterResourceSet(m_currentResourceSet);
 
-    foreach (const QByteArray *data, toDelete)
+    for (const QByteArray *data : qAsConst(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 53f4ee936..ecf2e086b 100644
--- a/src/designer/src/lib/shared/rcc.cpp
+++ b/src/designer/src/lib/shared/rcc.cpp
@@ -596,10 +596,11 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
     if (parent->m_children.contains(filename)) {
-        foreach (const QString &fileName, m_fileNames)
+        for (const QString &fileName : qAsConst(m_fileNames)) {
             qWarning("%s: Warning: potential duplicate alias detected: '%s'",
                      qPrintable(fileName), qPrintable(filename));
         }
+    }
     parent->m_children.insertMulti(filename, s);
     return true;
 }
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index fa4b12623..ccbd33fea 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -431,7 +431,7 @@ RichTextEditorToolBar::RichTextEditorToolBar(QDesignerFormEditorInterface *core,
     // Font size combo box
     m_font_size_input->setEditable(false);
     const QList<int> font_sizes = QFontDatabase::standardSizes();
-    foreach (int font_size, font_sizes)
+    for (int font_size : font_sizes)
         m_font_size_input->addItem(QString::number(font_size));
 
     connect(m_font_size_input, static_cast<QComboStringSignal>(&QComboBox::activated),
diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp
index 9d3730244..b11eb068e 100644
--- a/src/designer/src/lib/shared/shared_settings.cpp
+++ b/src/designer/src/lib/shared/shared_settings.cpp
@@ -155,7 +155,7 @@ QStringList QDesignerSharedSettings::additionalFormTemplatePaths() const
 {
     // get template paths excluding internal ones
     QStringList rc = formTemplatePaths();
-    foreach (const QString &internalTemplatePath, defaultFormTemplatePaths()) {
+    for (const QString &internalTemplatePath : defaultFormTemplatePaths()) {
         const int index = rc.indexOf(internalTemplatePath);
         if (index != -1)
             rc.removeAt(index);
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 4281522c2..a84adff07 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -312,11 +312,11 @@ void SignaturePanel::setData(const SignalSlotDialogData &d)
     m_model->clear();
 
     QStandardItem *lastExisting = 0;
-    foreach(const QString &s, d.m_existingMethods) {
+    for (const QString &s : d.m_existingMethods) {
         lastExisting = createDisabledItem(s);
         m_model->appendRow(lastExisting);
     }
-    foreach(const QString &s, d.m_fakeMethods)
+    for (const QString &s : d.m_fakeMethods)
         m_model->appendRow(createEditableItem(s));
     if (lastExisting)
         m_listView->scrollTo(m_model->indexFromItem(lastExisting));
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp
index ba4f1e639..7abc5fadb 100644
--- a/src/designer/src/lib/shared/widgetdatabase.cpp
+++ b/src/designer/src/lib/shared/widgetdatabase.cpp
@@ -367,7 +367,8 @@ void WidgetDataBase::loadPlugins()
     // 2) create a list plugins
     ItemList pluginList;
     const QDesignerPluginManager *pm = m_core->pluginManager();
-    foreach(QDesignerCustomWidgetInterface* c, pm->registeredCustomWidgets())
+    const auto &customWidgets = pm->registeredCustomWidgets();
+    for (QDesignerCustomWidgetInterface* c : customWidgets)
         pluginList += createCustomWidgetItem(c, pm->customWidgetData(c));
 
     // 3) replace custom classes or add new ones, remove them from existingCustomClasses,
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index be7ca4bc9..bbd4bac16 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -215,12 +215,10 @@ void WidgetFactory::loadPlugins()
 {
     m_customFactory.clear();
 
-    QDesignerPluginManager *pluginManager = m_core->pluginManager();
-
-    QList<QDesignerCustomWidgetInterface*> lst = pluginManager->registeredCustomWidgets();
-    foreach (QDesignerCustomWidgetInterface *c, lst) {
+    const QList<QDesignerCustomWidgetInterface*> &lst =
+        m_core->pluginManager()->registeredCustomWidgets();
+    for (QDesignerCustomWidgetInterface *c : lst)
         m_customFactory.insert(c->name(), c);
-    }
 }
 
 // Convencience to create non-widget objects. Returns 0 if unknown
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 6c38250d3..d54fb6b74 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -339,18 +339,21 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
 
     applyProperties(w, ui_widget->elementProperty());
 
-    foreach (DomAction *ui_action, ui_widget->elementAction()) {
+    const QList<DomAction *> &elementAction = ui_widget->elementAction();
+    for (DomAction *ui_action : elementAction) {
         QAction *child_action = create(ui_action, w);
         Q_UNUSED( child_action );
     }
 
-    foreach (DomActionGroup *ui_action_group, ui_widget->elementActionGroup()) {
+    const QList<DomActionGroup *> &elementActionGroup = ui_widget->elementActionGroup();
+    for (DomActionGroup *ui_action_group : elementActionGroup) {
         QActionGroup *child_action_group = create(ui_action_group, w);
         Q_UNUSED( child_action_group );
     }
 
     QWidgetList children;
-    foreach (DomWidget *ui_child, ui_widget->elementWidget()) {
+    const QList<DomWidget *> &elementWidget = ui_widget->elementWidget();
+    for (DomWidget *ui_child : elementWidget) {
         if (QWidget *child  = create(ui_child, w)) {
             children += child;
         } else {
@@ -359,7 +362,8 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
         }
     }
 
-    foreach (DomLayout *ui_lay, ui_widget->elementLayout()) {
+    const QList<DomLayout *> &elementLayout = ui_widget->elementLayout();
+    for (DomLayout *ui_lay : elementLayout) {
         QLayout *child_lay = create(ui_lay, 0, w);
         Q_UNUSED( child_lay );
     }
@@ -367,7 +371,7 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
     const QList<DomActionRef *> addActions = ui_widget->elementAddAction();
     if (!addActions.empty()) {
         const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-        foreach (DomActionRef *ui_action_ref, addActions) {
+        for (DomActionRef *ui_action_ref : addActions) {
             const QString name = ui_action_ref->attributeName();
             if (name == strings.separator) {
                 QAction *sep = new QAction(w);
@@ -394,7 +398,7 @@ QWidget *QAbstractFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidge
     const QStringList zOrderNames = ui_widget->elementZOrder();
     if (!zOrderNames.isEmpty()) {
         QList<QWidget *> zOrder = qvariant_cast<QWidgetList>(w->property("_q_zOrder"));
-        foreach (const QString &widgetName, zOrderNames) {
+        for (const QString &widgetName : zOrderNames) {
             if (QWidget *child = w->findChild<QWidget*>(widgetName)) {
                 if (child->parentWidget() == w) {
                     zOrder.removeAll(child);
@@ -434,12 +438,14 @@ QActionGroup *QAbstractFormBuilder::create(DomActionGroup *ui_action_group, QObj
     d->m_actionGroups.insert(ui_action_group->attributeName(), a);
     applyProperties(a, ui_action_group->elementProperty());
 
-    foreach (DomAction *ui_action, ui_action_group->elementAction()) {
+    const QList<DomAction*> &elementAction = ui_action_group->elementAction();
+    for (DomAction *ui_action : elementAction) {
         QAction *child_action = create(ui_action, a);
         Q_UNUSED( child_action );
     }
 
-    foreach (DomActionGroup *g, ui_action_group->elementActionGroup()) {
+    const QList<DomActionGroup *> &elementActionGroup = ui_action_group->elementActionGroup();
+    for (DomActionGroup *g : elementActionGroup) {
         QActionGroup *child_action_group = create(g, parent);
         Q_UNUSED( child_action_group );
     }
@@ -778,7 +784,8 @@ QLayout *QAbstractFormBuilder::create(DomLayout *ui_layout, QLayout *parentLayou
 
     applyProperties(layout, ui_layout->elementProperty());
 
-    foreach (DomLayoutItem *ui_item, ui_layout->elementItem()) {
+    const QList<DomLayoutItem *> &elementItem = ui_layout->elementItem();
+    for (DomLayoutItem *ui_item : elementItem) {
         if (QLayoutItem *item = create(ui_item, layout, parentWidget)) {
             addItem(ui_item, item, layout);
         }
@@ -947,7 +954,7 @@ QLayoutItem *QAbstractFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout
         const QList<DomProperty *> spacerProperties =  ui_spacer->elementProperty();
         if (!spacerProperties.empty()) {
             const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-            foreach (DomProperty *p, spacerProperties) {
+            for (DomProperty *p : spacerProperties) {
                 const QVariant v = toVariant(&QAbstractFormBuilderGadget::staticMetaObject, p); // ### remove me
                 if (v.isNull())
                     continue;
@@ -1372,7 +1379,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
         QList<QObject *> childObjects = widget->children();
 
         const QList<QWidget *> list = qvariant_cast<QWidgetList>(widget->property("_q_widgetOrder"));
-        foreach (QWidget *w, list) {
+        for (QWidget *w : list) {
             if (childObjects.contains(w)) {
                 children.append(w);
                 childObjects.removeAll(w);
@@ -1391,7 +1398,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
         }
     }
 
-    foreach (QObject *obj, children) {
+    for (QObject *obj : qAsConst(children)) {
         if (QWidget *childWidget = qobject_cast<QWidget*>(obj)) {
             if (d->m_laidout.contains(childWidget) || recursive == false)
                 continue;
@@ -1426,7 +1433,8 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent
 
     // add-action
     QList<DomActionRef*> ui_action_refs;
-    foreach (QAction *action, widget->actions()) {
+    const QList<QAction *> &actions = widget->actions();
+    for (QAction *action : actions) {
         if (DomActionRef *ui_action_ref = createActionRefDom(action)) {
             ui_action_refs.append(ui_action_ref);
         }
@@ -1578,7 +1586,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout
     }
 
     QList<DomLayoutItem*> ui_items;
-    foreach (const FormBuilderSaveLayoutEntry &item, newList) {
+    for (const FormBuilderSaveLayoutEntry &item : qAsConst(newList)) {
         if (DomLayoutItem *ui_item = createDom(item.item, lay, ui_parentWidget)) {
             if (item.row >= 0)
                 ui_item->setAttributeRow(item.row);
@@ -1731,7 +1739,7 @@ QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QL
 {
     DomPropertyHash map;
 
-    foreach (DomProperty *p, properties)
+    for (DomProperty *p : properties)
         map.insert(p->attributeName(), p);
 
     return map;
@@ -1873,11 +1881,11 @@ static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *i
     DomProperty *p;
     QVariant v;
 
-    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+    for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles)
         if ((p = formBuilder->saveText(it.second, item->data(it.first.second))))
             properties->append(p);
 
-    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+    for (const QFormBuilderStrings::RoleNName &it : strings.itemRoles)
         if ((v = item->data(it.first)).isValid() &&
             (p = variantToDomProperty(abstractFormBuilder,
                 static_cast<const QMetaObject *>(&QAbstractFormBuilderGadget::staticMetaObject),
@@ -1906,7 +1914,7 @@ static void loadItemProps(QAbstractFormBuilder *abstractFormBuilder, T *item,
     DomProperty *p;
     QVariant v;
 
-    foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+    for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles)
         if ((p = properties.value(it.second))) {
             v = formBuilder->textBuilder()->loadText(p);
             QVariant nativeValue = formBuilder->textBuilder()->toNativeValue(v);
@@ -1914,7 +1922,7 @@ static void loadItemProps(QAbstractFormBuilder *abstractFormBuilder, T *item,
             item->setData(it.first.second, v);
         }
 
-    foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+    for (const QFormBuilderStrings::RoleNName &it : strings.itemRoles)
         if ((p = properties.value(it.second)) &&
             (v = formBuilder->toVariant(&QAbstractFormBuilderGadget::staticMetaObject, p)).isValid())
             item->setData(it.first, v);
@@ -1958,7 +1966,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW
 
         QList<DomProperty*> properties;
 
-        foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles) {
+        for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) {
             p = saveText(it.second, treeWidget->headerItem()->data(c, it.first.second));
             // Prevent uic 4.4.X from crashing if it cannot find a column text
             if (!p && it.first.first == Qt::EditRole && it.second == QStringLiteral("text")) {
@@ -1973,7 +1981,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW
                 properties.append(p);
         }
 
-        foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        for (const QFormBuilderStrings::RoleNName &it : strings.itemRoles)
             if ((v = treeWidget->headerItem()->data(c, it.first)).isValid() &&
                 (p = variantToDomProperty(this, &QAbstractFormBuilderGadget::staticMetaObject, it.second, v)))
                 properties.append(p);
@@ -2002,11 +2010,11 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW
 
         QList<DomProperty*> properties;
         for (int c = 0; c < treeWidget->columnCount(); c++) {
-            foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+            for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles)
                 if ((p = saveText(it.second, item->data(c, it.first.second))))
                     properties.append(p);
 
-            foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+            for (const QFormBuilderStrings::RoleNName &it : strings.itemRoles)
                 if ((v = item->data(c, it.first)).isValid() &&
                     (p = variantToDomProperty(this, &QAbstractFormBuilderGadget::staticMetaObject, it.second, v)))
                     properties.append(p);
@@ -2167,7 +2175,7 @@ void QAbstractFormBuilder::saveItemViewExtraInfo(const QAbstractItemView *itemVi
     //
     // Special handling for qtableview/qtreeview fake header attributes
     //
-    static QStringList realPropertyNames =
+    static const QStringList realPropertyNames =
             (QStringList() << QStringLiteral("visible")
                            << QStringLiteral("cascadingSectionResizes")
                            << QStringLiteral("defaultSectionSize")
@@ -2178,12 +2186,12 @@ void QAbstractFormBuilder::saveItemViewExtraInfo(const QAbstractItemView *itemVi
 
     if (const QTreeView *treeView = qobject_cast<const QTreeView*>(itemView)) {
         QList<DomProperty*> viewProperties = ui_widget->elementAttribute();
-        QList<DomProperty*> headerProperties = computeProperties(treeView->header());
-        foreach (const QString &realPropertyName, realPropertyNames) {
+        const QList<DomProperty*> &headerProperties = computeProperties(treeView->header());
+        for (const QString &realPropertyName : realPropertyNames) {
             const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                               + realPropertyName.mid(1);
             const QString fakePropertyName = QStringLiteral("header") + upperPropertyName;
-            foreach (DomProperty *property, headerProperties) {
+            for (DomProperty *property : headerProperties) {
                 if (property->attributeName() == realPropertyName) {
                     property->setAttributeName(fakePropertyName);
                     viewProperties << property;
@@ -2192,22 +2200,22 @@ void QAbstractFormBuilder::saveItemViewExtraInfo(const QAbstractItemView *itemVi
         }
         ui_widget->setElementAttribute(viewProperties);
     } else if (const QTableView *tableView = qobject_cast<const QTableView*>(itemView)) {
-        static QStringList headerPrefixes =
+        static const QStringList headerPrefixes =
                 (QStringList() << QStringLiteral("horizontalHeader")
                                << QStringLiteral("verticalHeader"));
 
         QList<DomProperty*> viewProperties = ui_widget->elementAttribute();
-        foreach (const QString &headerPrefix, headerPrefixes) {
+        for (const QString &headerPrefix : headerPrefixes) {
             QList<DomProperty*> headerProperties;
             if (headerPrefix == QStringLiteral("horizontalHeader"))
                 headerProperties = computeProperties(tableView->horizontalHeader());
             else
                 headerProperties = computeProperties(tableView->verticalHeader());
-            foreach (const QString &realPropertyName, realPropertyNames) {
+            for (const QString &realPropertyName : realPropertyNames) {
                 const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                                   + realPropertyName.mid(1);
                 const QString fakePropertyName = headerPrefix + upperPropertyName;
-                foreach (DomProperty *property, headerProperties) {
+                for (DomProperty *property : qAsConst(headerProperties)) {
                     if (property->attributeName() == realPropertyName) {
                         property->setAttributeName(fakePropertyName);
                         viewProperties << property;
@@ -2290,7 +2298,8 @@ void QAbstractFormBuilder::loadListWidgetExtraInfo(DomWidget *ui_widget, QListWi
     Q_UNUSED(parentWidget);
     const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
 
-    foreach (DomItem *ui_item, ui_widget->elementItem()) {
+    const QList<DomItem *> &elementItem = ui_widget->elementItem();
+    for (DomItem *ui_item : elementItem) {
         const DomPropertyHash properties = propertyMap(ui_item->elementProperty());
         QListWidgetItem *item = new QListWidgetItem(listWidget);
         loadItemPropsNFlags<QListWidgetItem>(this, item, properties);
@@ -2320,12 +2329,12 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
         DomProperty *p;
         QVariant v;
 
-        foreach (const QFormBuilderStrings::RoleNName &it, strings.itemRoles)
+        for (const QFormBuilderStrings::RoleNName &it : strings.itemRoles)
             if ((p = properties.value(it.second)) &&
                 (v = toVariant(&QAbstractFormBuilderGadget::staticMetaObject, p)).isValid())
                 treeWidget->headerItem()->setData(i, it.first, v);
 
-        foreach (const QFormBuilderStrings::TextRoleNName &it, strings.itemTextRoles)
+        for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles)
             if ((p = properties.value(it.second))) {
                 v = textBuilder()->loadText(p);
                 QVariant nativeValue = textBuilder()->toNativeValue(v);
@@ -2342,7 +2351,8 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
     }
 
     QQueue<QPair<DomItem *, QTreeWidgetItem *> > pendingQueue;
-    foreach (DomItem *ui_item, ui_widget->elementItem())
+    const QList<DomItem *> &widgetElementItem = ui_widget->elementItem();
+    for (DomItem *ui_item : widgetElementItem)
         pendingQueue.enqueue(qMakePair(ui_item, (QTreeWidgetItem *)0));
 
     while (!pendingQueue.isEmpty()) {
@@ -2359,7 +2369,7 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
 
         const QList<DomProperty *> properties = domItem->elementProperty();
         int col = -1;
-        foreach (DomProperty *property, properties) {
+        for (DomProperty *property : properties) {
             if (property->attributeName() == strings.flagsAttribute && !property->elementSet().isEmpty()) {
                 currentItem->setFlags(enumKeysToValue<Qt::ItemFlags>(itemFlags_enum, property->elementSet().toLatin1()));
             } else if (property->attributeName() == strings.textAttribute && property->elementString()) {
@@ -2397,7 +2407,8 @@ void QAbstractFormBuilder::loadTreeWidgetExtraInfo(DomWidget *ui_widget, QTreeWi
             }
         }
 
-        foreach (DomItem *childItem, domItem->elementItem())
+        const QList<DomItem *> &elementItem = domItem->elementItem();
+        for (DomItem *childItem : elementItem)
             pendingQueue.enqueue(qMakePair(childItem, currentItem));
 
     }
@@ -2438,7 +2449,8 @@ void QAbstractFormBuilder::loadTableWidgetExtraInfo(DomWidget *ui_widget, QTable
         }
     }
 
-    foreach (DomItem *ui_item, ui_widget->elementItem()) {
+    const QList<DomItem *> &elementItem = ui_widget->elementItem();
+    for (DomItem *ui_item : elementItem) {
         if (ui_item->hasAttributeRow() && ui_item->hasAttributeColumn()) {
             const DomPropertyHash properties = propertyMap(ui_item->elementProperty());
             QTableWidgetItem *item = new QTableWidgetItem;
@@ -2455,7 +2467,8 @@ void QAbstractFormBuilder::loadComboBoxExtraInfo(DomWidget *ui_widget, QComboBox
 {
     Q_UNUSED(parentWidget);
     const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
-    foreach (DomItem *ui_item, ui_widget->elementItem()) {
+    const QList<DomItem *> &elementItem = ui_widget->elementItem();
+    for (DomItem *ui_item : elementItem) {
         const DomPropertyHash properties = propertyMap(ui_item->elementProperty());
         QString text;
         QIcon icon;
@@ -2542,7 +2555,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract
     //
     // Special handling for qtableview/qtreeview fake header attributes
     //
-    static QStringList realPropertyNames =
+    static const QStringList realPropertyNames =
             (QStringList() << QStringLiteral("visible")
                            << QStringLiteral("cascadingSectionResizes")
                            << QStringLiteral("defaultSectionSize")
@@ -2552,13 +2565,13 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract
                            << QStringLiteral("stretchLastSection"));
 
     if (QTreeView *treeView = qobject_cast<QTreeView*>(itemView)) {
-        QList<DomProperty*> allAttributes = ui_widget->elementAttribute();
+        const QList<DomProperty*> &allAttributes = ui_widget->elementAttribute();
         QList<DomProperty*> headerProperties;
-        foreach (const QString &realPropertyName, realPropertyNames) {
+        for (const QString &realPropertyName : realPropertyNames) {
             const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                               + realPropertyName.mid(1);
             const QString fakePropertyName = QStringLiteral("header") + upperPropertyName;
-            foreach (DomProperty *attr, allAttributes) {
+            for (DomProperty *attr : allAttributes) {
                 if (attr->attributeName() == fakePropertyName) {
                     attr->setAttributeName(realPropertyName);
                     headerProperties << attr;
@@ -2567,18 +2580,18 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract
         }
         applyProperties(treeView->header(), headerProperties);
     } else if (QTableView *tableView = qobject_cast<QTableView*>(itemView)) {
-        static QStringList headerPrefixes =
+        static const QStringList headerPrefixes =
                 (QStringList() << QStringLiteral("horizontalHeader")
                                << QStringLiteral("verticalHeader"));
 
-        QList<DomProperty*> allAttributes = ui_widget->elementAttribute();
-        foreach (const QString &headerPrefix, headerPrefixes) {
+        const QList<DomProperty*> allAttributes = ui_widget->elementAttribute();
+        for (const QString &headerPrefix : headerPrefixes) {
             QList<DomProperty*> headerProperties;
-            foreach (const QString &realPropertyName, realPropertyNames) {
+            for (const QString &realPropertyName : realPropertyNames) {
                 const QString upperPropertyName = realPropertyName.at(0).toUpper()
                                                   + realPropertyName.mid(1);
                 const QString fakePropertyName = headerPrefix + upperPropertyName;
-                foreach (DomProperty *attr, allAttributes) {
+                for (DomProperty *attr : allAttributes) {
                     if (attr->attributeName() == fakePropertyName) {
                         attr->setAttributeName(realPropertyName);
                         headerProperties << attr;
@@ -2714,7 +2727,8 @@ DomActionGroup *QAbstractFormBuilder::createDom(QActionGroup *actionGroup)
 
     QList<DomAction*> ui_actions;
 
-    foreach (QAction *action, actionGroup->actions()) {
+    const QList<QAction *> &actions = actionGroup->actions();
+    for (QAction *action : actions) {
         if (DomAction *ui_action = createDom(action)) {
             ui_actions.append(ui_action);
         }
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 9ae90e4f6..cdf3b74a2 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -459,7 +459,8 @@ static void insertPlugins(QObject *o, QMap<QString, QDesignerCustomWidgetInterfa
     }
     // step 2) try with a collection of plugins
     if (QDesignerCustomWidgetCollectionInterface *c = qobject_cast<QDesignerCustomWidgetCollectionInterface *>(o)) {
-        foreach (QDesignerCustomWidgetInterface *iface, c->customWidgets())
+        const auto &collectionCustomWidgets = c->customWidgets();
+        for (QDesignerCustomWidgetInterface *iface : collectionCustomWidgets)
             customWidgets->insert(iface->name(), iface);
     }
 }
@@ -471,11 +472,11 @@ void QFormBuilder::updateCustomWidgets()
 {
     d->m_customWidgets.clear();
 
-    foreach (const QString &path, d->m_pluginPaths) {
+    for (const QString &path : qAsConst(d->m_pluginPaths)) {
         const QDir dir(path);
         const QStringList candidates = dir.entryList(QDir::Files);
 
-        foreach (const QString &plugin, candidates) {
+        for (const QString &plugin : candidates) {
             if (!QLibrary::isLibrary(plugin))
                 continue;
 
@@ -490,9 +491,8 @@ void QFormBuilder::updateCustomWidgets()
     }
     // Check statically linked plugins
     const QObjectList staticPlugins = QPluginLoader::staticInstances();
-    if (!staticPlugins.empty())
-        foreach (QObject *o, staticPlugins)
-            insertPlugins(o, &d->m_customWidgets);
+    for (QObject *o : staticPlugins)
+        insertPlugins(o, &d->m_customWidgets);
 }
 
 /*!
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index cb963393e..17b00bb7e 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -477,7 +477,7 @@ QFormBuilderStrings::QFormBuilderStrings() :
     itemRoles.append(qMakePair(Qt::ForegroundRole, QString::fromLatin1("foreground")));
     itemRoles.append(qMakePair(Qt::CheckStateRole, QString::fromLatin1("checkState")));
 
-    foreach (const RoleNName &it, itemRoles)
+    for (const RoleNName &it : qAsConst(itemRoles))
         treeItemRoleHash.insert(it.second, it.first);
 
     itemTextRoles.append(qMakePair(qMakePair(Qt::EditRole, Qt::DisplayPropertyRole),
diff --git a/src/designer/src/plugins/tools/view3d/view3d.cpp b/src/designer/src/plugins/tools/view3d/view3d.cpp
index bf428c9e7..ac478eb26 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d.cpp
@@ -188,8 +188,8 @@ void QView3DWidget::clear()
 {
     makeCurrent();
     glDeleteLists(m_form_list_id, 1);
-    foreach (GLuint id, m_texture_map)
-        glDeleteTextures(1, &id);
+    for (TextureMap::iterator it = m_texture_map.begin(), end = m_texture_map.end(); it != end; ++it)
+        glDeleteTextures(1, &(it.value()));
     m_texture_map.clear();
     m_widget_name_map.clear();
     m_next_widget_name = 0;
@@ -378,8 +378,8 @@ static void walkWidgetTree(QDesignerFormEditorInterface *core, int depth, QWidge
     if (!skipWidget(core, widget))
         func(depth++, widget);
 
-    QObjectList child_obj_list = widget->children();
-    foreach (QObject *child_obj, child_obj_list) {
+    const QObjectList child_obj_list = widget->children();
+    for (QObject *child_obj : child_obj_list) {
         QWidget *child = qobject_cast<QWidget*>(child_obj);
         if (child != 0)
             walkWidgetTree(core, depth, child, func);
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index 8c5e53824..4f38d4f52 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -214,7 +214,8 @@ public:
     virtual bool eventFilter(QObject *o, QEvent *event)
     {
         if (event->type() == QEvent::LanguageChange) {
-            foreach (const QByteArray &prop, o->dynamicPropertyNames()) {
+            const QList<QByteArray> &dynamicPropertyNames = o->dynamicPropertyNames();
+            for (const QByteArray &prop : dynamicPropertyNames) {
                 if (prop.startsWith(PROP_GENERIC_PREFIX)) {
                     const QByteArray propName = prop.mid(sizeof(PROP_GENERIC_PREFIX) - 1);
                     const QUiTranslatableStringValue tsv =
@@ -418,7 +419,7 @@ void FormBuilderPrivate::applyProperties(QObject *o, const QList<DomProperty*> &
     // (as they are "shadowed" by the property sheets in designer). So do the initial
     // translation here.
     bool anyTrs = false;
-    foreach (const DomProperty *p, properties) {
+    for (const DomProperty *p : properties) {
         QUiTranslatableStringValue strVal;
         const QString text = convertTranslatable(p, m_class, &strVal);
         if (text.isEmpty())
@@ -635,7 +636,8 @@ QUiLoader::QUiLoader(QObject *parent)
     d->builder.loader = this;
 
     QStringList paths;
-    foreach (const QString &path, QApplication::libraryPaths()) {
+    const QStringList &libraryPaths = QApplication::libraryPaths();
+    for (const QString &path : libraryPaths) {
         QString libPath = path;
         libPath  += QDir::separator();
         libPath  += QStringLiteral("designer");
@@ -789,9 +791,9 @@ QStringList QUiLoader::availableWidgets() const
     d->setupWidgetMap();
     widget_map available = *g_widgets();
 
-    foreach (QDesignerCustomWidgetInterface *plugin, d->builder.customWidgets()) {
+    const auto &customWidgets = d->builder.customWidgets();
+    for (QDesignerCustomWidgetInterface *plugin : customWidgets)
         available.insert(plugin->name(), true);
-    }
 
     return available.keys();
 }
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 317627412..603834dc6 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -537,14 +537,14 @@ void DeviceSkin::paintEvent( QPaintEvent *)
     if ( buttonPressed == true ) {
         toDraw += buttonIndex;
     }
-    foreach (int toggle, m_parameters.toggleAreaList) {
+    for (int toggle : qAsConst(m_parameters.toggleAreaList)) {
         const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[toggle];
         if (flipped_open || ba.activeWhenClosed) {
             if (ba.toggleArea && ba.toggleActiveArea)
                 toDraw += toggle;
         }
     }
-    foreach (int button, toDraw ) {
+    for (int button : qAsConst(toDraw)) {
         const DeviceSkinButtonArea &ba = m_parameters.buttonAreas[button];
         const QRect r = buttonRegions[button].boundingRect();
         if ( ba.area.count() > 2 )
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index f313b10da..188ed2c8a 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -77,7 +77,7 @@ static QIcon createIconSet(const QString &name)
         << (QString::fromUtf8(":/qt-project.org/shared/images/win/") + name);
 #endif
 
-    foreach (const QString &f, candidates) {
+    for (const QString &f : qAsConst(candidates)) {
         if (QFile::exists(f))
             return QIcon(f);
     }
diff --git a/src/shared/qtgradienteditor/qtgradientutils.cpp b/src/shared/qtgradienteditor/qtgradientutils.cpp
index 6ae3999a8..11e8d089a 100644
--- a/src/shared/qtgradienteditor/qtgradientutils.cpp
+++ b/src/shared/qtgradienteditor/qtgradientutils.cpp
@@ -390,7 +390,8 @@ static QStringList styleSheetParameters(const QGradient &gradient)
 static QStringList styleSheetStops(const QGradient &gradient)
 {
     QStringList result;
-    foreach (const QGradientStop &stop, gradient.stops()) {
+    const QGradientStops &stops = gradient.stops();
+    for (const QGradientStop &stop : stops) {
         const QColor color = stop.second;
 
         const QString stopDescription = QLatin1String("stop:") + QString::number(stop.first) + QLatin1String(" rgba(")