feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix missing path to Ninja from Qt installers

Browse Source 
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>
This commit is contained in:
Eike Ziller
2023-01-13 15:43:10 +01:00
parent 274bb27cf3
commit 9256340e5b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -2168,8 +2168,8 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const
ProjectExplorer::IDevice::ConstPtr devicePtr = BuildDeviceKitAspect::device(kit()); ProjectExplorer::IDevice::ConstPtr devicePtr = BuildDeviceKitAspect::device(kit());
result = devicePtr ? devicePtr->systemEnvironment() : Environment::systemEnvironment(); result = devicePtr ? devicePtr->systemEnvironment() : Environment::systemEnvironment();
} }
addToEnvironment(result);
kit()->addToBuildEnvironment(result); kit()->addToBuildEnvironment(result);
addToEnvironment(result);
result.modify(project()->additionalEnvironment()); result.modify(project()->additionalEnvironment());
return result; return result;
} }