Blob Blame History Raw
diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp qt-creator-opensource-src-12.0.1-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
--- qt-creator-opensource-src-12.0.1/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp	2023-12-11 02:10:01.000000000 +0100
+++ qt-creator-opensource-src-12.0.1-new/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp	2023-12-13 07:49:40.641600458 +0100
@@ -670,7 +670,7 @@ QVariant CMakeGeneratorKitAspectFactory:
         const bool hasNinja = [k, tool] {
             if (Internal::settings().ninjaPath().isEmpty()) {
                 auto findNinja = [](const Environment &env) -> bool {
-                    return !env.searchInPath("ninja").isEmpty();
+                    return !env.searchInPath("ninja-build").isEmpty();
                 };
                 if (!findNinja(tool->filePath().deviceEnvironment()))
                     return findNinja(k->buildEnvironment());
diff -rupN --no-dereference qt-creator-opensource-src-12.0.1/src/plugins/mesonprojectmanager/mesontools.h qt-creator-opensource-src-12.0.1-new/src/plugins/mesonprojectmanager/mesontools.h
--- qt-creator-opensource-src-12.0.1/src/plugins/mesonprojectmanager/mesontools.h	2023-12-11 02:09:59.000000000 +0100
+++ qt-creator-opensource-src-12.0.1-new/src/plugins/mesonprojectmanager/mesontools.h	2023-12-13 07:49:40.644600402 +0100
@@ -32,7 +32,7 @@ public:
                                const Utils::FilePath &exe)
     {
         // TODO improve this
-        if (exe.fileName().contains("ninja"))
+        if (exe.fileName().contains("ninja-build"))
             addTool(std::make_shared<NinjaWrapper>(name, exe, itemId));
         else
             addTool(std::make_shared<MesonWrapper>(name, exe, itemId));