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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Ibb433d3e1ea2c0632dd2f710c8ec995de7599978
This commit is contained in:
Eike Ziller
2023-06-19 10:08:56 +02:00
parent 6c601b8cd4 d30689c9a9
commit f88db30319
65 changed files with 412 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2058,7 +2058,10 @@ void CMakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const
Environment CMakeBuildConfiguration::configureEnvironment() const
{
return aspect<ConfigureEnvironmentAspect>()->environment();
Environment env = aspect<ConfigureEnvironmentAspect>()->environment();
addToEnvironment(env);
return env;
}
QString CMakeBuildSystem::cmakeBuildType() const