diff --git a/src/libs/utils/variablechooser.cpp b/src/libs/utils/variablechooser.cpp
index 51ad12f524f..a3909e72e77 100644
--- a/src/libs/utils/variablechooser.cpp
+++ b/src/libs/utils/variablechooser.cpp
@@ -309,15 +309,16 @@ void VariableGroupItem::populateGroup(MacroExpander *expander)
 {
     if (!expander)
         return;
-
-    foreach (const QByteArray &variable, expander->visibleVariables()) {
+    const QList<QByteArray> variables = expander->visibleVariables();
+    for (const QByteArray &variable : variables) {
         auto item = new VariableItem;
         item->m_variable = variable;
         item->m_expander = expander;
         appendChild(item);
     }
 
-    foreach (const MacroExpanderProvider &subProvider, expander->subProviders()) {
+    const MacroExpanderProviders subProviders = expander->subProviders();
+    for (const MacroExpanderProvider &subProvider : subProviders) {
         if (!subProvider)
             continue;
         if (expander->isAccumulating()) {
@@ -434,7 +435,8 @@ void VariableChooser::addSupportForChildWidgets(QWidget *parent, MacroExpander *
 {
      auto chooser = new VariableChooser(parent);
      chooser->addMacroExpanderProvider([expander] { return expander; });
-     foreach (QWidget *child, parent->findChildren<QWidget *>()) {
+     const QList<QWidget *> children = parent->findChildren<QWidget *>();
+     for (QWidget *child : children) {
          if (qobject_cast<QLineEdit *>(child)
                  || qobject_cast<QTextEdit *>(child)
                  || qobject_cast<QPlainTextEdit *>(child))
diff --git a/tests/auto/json/tst_json.cpp b/tests/auto/json/tst_json.cpp
index cb38a70489a..f583a1ba3ef 100644
--- a/tests/auto/json/tst_json.cpp
+++ b/tests/auto/json/tst_json.cpp
@@ -2487,7 +2487,8 @@ void tst_Json::unicodeKeys()
     JsonObject o = doc.object();
 
     QCOMPARE(o.keys().size(), size_t(5));
-    Q_FOREACH (const std::string &k, o.keys()) {
+    const JsonObject::Keys keys = o.keys();
+    for (const std::string &k : keys) {
         QByteArray key(k.data());
         std::string suffix = key.mid(key.indexOf('_')).data();
         QCOMPARE(o[key.data()].toString(), "hello" + suffix);