diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-01-13 15:43:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-16 07:43:38 +0000 |
| commit | 9256340e5bed3a57b8f4cdca36659348211697ad (patch) | |
| tree | b7ec80a1dc4c9c00de41887a2d0e7cb63ff45332 | |
| parent | 274bb27cf3b8a5d888bafa069925e230bf5ae90c (diff) | |
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 <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 1823462382..3c0e89fcbd 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; } |