From 451de5adb87b544b27ef241a4689371a4b471954 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 6 Jun 2024 08:10:18 +0200
Subject: [PATCH] Fix build on older Apple Clang

Actually not sooo old.

compilationdbparser.cpp:172:34: error: redefinition of 'it'

Amends f3e164af4f8e1cd86821fa937233cfbc2b059b3b

Change-Id: Ib3fc97b39921138d2a27bbe8f95c504c8823d09f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp   | 10 +++++-----
 .../compilationdbparser.cpp                            |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 730cdaed4cf..13aee2f2de9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -84,11 +84,11 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc)
         // Cache mime check result for speed up
         if (!isIgnored) {
             if (auto it = m_mimeBinaryCache.get<std::optional<bool>>(
-                [mimeType](const QHash<QString, bool> &cache) -> std::optional<bool> {
-                    auto it = cache.find(mimeType.name());
-                    if (it != cache.end())
-                        return *it;
-                    return {};
+                    [mimeType](const QHash<QString, bool> &cache) -> std::optional<bool> {
+                        auto cache_it = cache.find(mimeType.name());
+                        if (cache_it != cache.end())
+                            return *cache_it;
+                        return {};
                     })) {
                 isIgnored = *it;
             } else {
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
index d613c81faf5..97ed389bc2b 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
@@ -169,9 +169,9 @@ void CompilationDbParser::start()
             if (!isIgnored) {
                 if (auto it = m_mimeBinaryCache.get<std::optional<bool>>(
                         [mimeType](const QHash<QString, bool> &cache) -> std::optional<bool> {
-                            auto it = cache.find(mimeType.name());
-                            if (it != cache.end())
-                                return *it;
+                            const auto cache_it = cache.find(mimeType.name());
+                            if (cache_it != cache.end())
+                                return *cache_it;
                             return {};
                         })) {
                     isIgnored = *it;