From 9256340e5bed3a57b8f4cdca36659348211697ad Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 13 Jan 2023 15:43:10 +0100 Subject: [PATCH] CMake: Fix missing path to Ninja from Qt installers In the configure environment for MSVC toolchains. The MSVC toolchain actually overwrites the PATH environment (triggered via kit()->addToBuildEnvironment(result)), which it shouldn't. But this is a minimal fix for Qt Creator 9.0 that also is in line with what BuildConfiguration::baseEnvironment() does. Fixes: QTCREATORBUG-28685 Change-Id: I0cb8e3c84419403672175bd581c16d90902e23ba Reviewed-by: David Schulz --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 1823462382c..3c0e89fcbdb 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -2168,8 +2168,8 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const ProjectExplorer::IDevice::ConstPtr devicePtr = BuildDeviceKitAspect::device(kit()); result = devicePtr ? devicePtr->systemEnvironment() : Environment::systemEnvironment(); } - addToEnvironment(result); kit()->addToBuildEnvironment(result); + addToEnvironment(result); result.modify(project()->additionalEnvironment()); return result; }