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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Change-Id: I73396bcd07852ff5e01d73b06ebd64ab6af802e5
This commit is contained in:
Eike Ziller
2023-01-18 10:02:35 +01:00
parent aff6c4b2d2 9256340e5b
commit 561b815d7b
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2177,8 +2177,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;
}