diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index a8ae84077ec..3db61fe1211 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1197,7 +1197,8 @@ void CMakeBuildSystem::updateQmlJSCodeModel(const QStringList &extraHeaderPaths,
     projectInfo.importPaths.clear();
 
     auto addImports = [&projectInfo](const QString &imports) {
-        foreach (const QString &import, CMakeConfigItem::cmakeSplitValue(imports))
+        const QStringList importList = CMakeConfigItem::cmakeSplitValue(imports);
+        for (const QString &import : importList)
             projectInfo.importPaths.maybeInsert(FilePath::fromString(import), QmlJS::Dialect::Qml);
     };
 
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index e79a9d55000..05160ff152b 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -99,7 +99,8 @@ public:
         m_comboBox->setEnabled(false);
         m_comboBox->setToolTip(ki->description());
 
-        foreach (CMakeTool *tool, CMakeToolManager::cmakeTools())
+        const QList<CMakeTool *> tools = CMakeToolManager::cmakeTools();
+        for (const CMakeTool *tool : tools)
             cmakeToolAdded(tool->id());
 
         updateComboBox();
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 9bf2897744d..cdc9423d7f9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -80,7 +80,8 @@ static QStringList scanDirectory(const FilePath &path, const QString &prefix)
     QStringList result;
     qCDebug(cmInputLog) << "Scanning for directories matching" << prefix << "in" << path;
 
-    foreach (const FilePath &entry, path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot})) {
+    const QList<FilePath> entries = path.dirEntries({{prefix + "*"}, QDir::Dirs | QDir::NoDotAndDotDot});
+    for (const FilePath &entry : entries) {
         QTC_ASSERT(entry.isDir(), continue);
         result.append(entry.toString());
     }
@@ -119,7 +120,8 @@ QStringList CMakeProjectImporter::importCandidates()
 
     candidates << scanDirectory(projectFilePath().absolutePath(), "build");
 
-    foreach (Kit *k, KitManager::kits()) {
+    const QList<Kit *> kits = KitManager::kits();
+    for (const Kit *k : kits) {
         FilePath shadowBuildDirectory
             = CMakeBuildConfiguration::shadowBuildDirectory(projectFilePath(),
                                                             k,
@@ -533,7 +535,7 @@ void CMakeProjectPlugin::testCMakeProjectImporterQt()
     QFETCH(QString, expectedQmake);
 
     CMakeConfig config;
-    foreach (const QString &c, cache) {
+    for (const QString &c : qAsConst(cache)) {
         const int pos = c.indexOf('=');
         Q_ASSERT(pos > 0);
         const QString key = c.left(pos);
@@ -590,7 +592,7 @@ void CMakeProjectPlugin::testCMakeProjectImporterToolChain()
     QCOMPARE(expectedLanguages.count(), expectedToolChains.count());
 
     CMakeConfig config;
-    foreach (const QString &c, cache) {
+    for (const QString &c : qAsConst(cache)) {
         const int pos = c.indexOf('=');
         Q_ASSERT(pos > 0);
         const QString key = c.left(pos);
diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index 8b17b264544..09a6bfbf2e9 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -243,7 +243,8 @@ CMakeToolItemModel::CMakeToolItemModel()
                            {ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
     rootItem()->appendChild(new StaticTreeItem(tr("Manual")));
 
-    foreach (const CMakeTool *item, CMakeToolManager::cmakeTools())
+    const QList<CMakeTool *> items = CMakeToolManager::cmakeTools();
+    for (const CMakeTool *item : items)
         addCMakeTool(item, false);
 
     CMakeTool *defTool = CMakeToolManager::defaultCMakeTool();
@@ -355,7 +356,7 @@ void CMakeToolItemModel::removeCMakeTool(const Utils::Id &id)
 
 void CMakeToolItemModel::apply()
 {
-    foreach (const Utils::Id &id, m_removedItems)
+    for (const Utils::Id &id : qAsConst(m_removedItems))
         CMakeToolManager::deregisterCMakeTool(id);
 
     QList<CMakeToolTreeItem *> toRegister;
@@ -372,7 +373,7 @@ void CMakeToolItemModel::apply()
         }
     });
 
-    foreach (CMakeToolTreeItem *item, toRegister) {
+    for (CMakeToolTreeItem *item : qAsConst(toRegister)) {
         CMakeTool::Detection detection = item->m_autodetected ? CMakeTool::AutoDetection
                                                               : CMakeTool::ManualDetection;
         auto cmake = std::make_unique<CMakeTool>(detection, item->m_id);
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 543211475a4..482c2d05a38 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -432,7 +432,7 @@ static QStringList parseDefinition(const QString &definition)
     bool ignoreWord = false;
     QVector<QChar> braceStack;
 
-    foreach (const QChar &c, definition) {
+    for (const QChar &c : definition) {
         if (c == '[' || c == '<' || c == '(') {
             braceStack.append(c);
             ignoreWord = false;
@@ -498,7 +498,7 @@ QStringList CMakeTool::parseVariableOutput(const QString &output)
 {
     const QStringList variableList = output.split('\n');
     QStringList result;
-    foreach (const QString &v, variableList) {
+    for (const QString &v : variableList) {
         if (v.startsWith("CMAKE_COMPILER_IS_GNU<LANG>")) { // This key takes a compiler name :-/
             result << "CMAKE_COMPILER_IS_GNUCC"
                    << "CMAKE_COMPILER_IS_GNUCXX";
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
index 093e5f24ac7..8c5af3b140b 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
@@ -93,7 +93,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
     const QStringList execs = env.appendExeExtensions(QLatin1String("cmake"));
 
     FilePaths suspects;
-    foreach (const FilePath &base, path) {
+    for (const FilePath &base : qAsConst(path)) {
         if (base.isEmpty())
             continue;
 
@@ -106,7 +106,7 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
     }
 
     std::vector<std::unique_ptr<CMakeTool>> found;
-    foreach (const FilePath &command, suspects) {
+    for (const FilePath &command : qAsConst(suspects)) {
         auto item = std::make_unique<CMakeTool>(CMakeTool::AutoDetection, CMakeTool::createId());
         item->setFilePath(command);
         item->setDisplayName(CMakeToolManager::tr("System CMake at %1").arg(command.toUserOutput()));