From 23092b57b835f658460a9f0e52d3a46912a88814 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 17 Oct 2022 20:11:08 +0200
Subject: [PATCH] CMakePM: Use filePath().deviceEnvironment() to find ninja

Amends 45ec26783f484a3138de6be6c4e36e658b3f94fd

Change-Id: I05b52295841d60ff693d6e7b12c9e4ceaf0f09eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 523bafca68d..32a00daf5b0 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -677,7 +677,7 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
         return g.matches("Ninja");
     });
     if (it != known.constEnd()) {
-        const bool hasNinja = [k]() {
+        const bool hasNinja = [k, tool]() {
             Internal::CMakeSpecificSettings *settings
                 = Internal::CMakeProjectPlugin::projectTypeSpecificSettings();
 
@@ -685,7 +685,7 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
                 auto findNinja = [](const Environment &env) -> bool {
                     return !env.searchInPath("ninja").isEmpty();
                 };
-                if (!findNinja(Environment::systemEnvironment()))
+                if (!findNinja(tool->filePath().deviceEnvironment()))
                     return findNinja(k->buildEnvironment());
             }
             return true;