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

Merge remote-tracking branch 'origin/13.0' into qds/dev

Browse Source 
Change-Id: I1d328f67a1c538e36a54f9660d5fb2840a6753df
This commit is contained in:
Tim Jenssen
2024-02-29 19:26:53 +01:00
parent 443c3477ab 4f30c2b4ed
commit 56c4ba1db4
519 changed files with 13916 additions and 7737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/cmakegen/cmakegenerator.cpp
View File

@@ -278,7 +278,7 @@ QString CMakeGenerator::makeEnvironmentVariable(const QString &key) const
auto envItems = m_buildSystem->environment();
auto confEnv = std::find_if(envItems.begin(),
envItems.end(),
[key](Utils::NameValueItem &item) { return item.name == key; });
[key](Utils::EnvironmentItem &item) { return item.name == key; });
if (confEnv != envItems.end())
value = confEnv->value;
}

2
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
View File

@@ -277,7 +277,7 @@ const QString projectEnvironmentVariable(const QString &key)
if (auto buildSystem = QmlBuildSystem::getStartupBuildSystem()) {
auto envItems = buildSystem->environment();
auto confEnv = std::find_if(envItems.begin(), envItems.end(), [key](NameValueItem &item) {
auto confEnv = std::find_if(envItems.begin(), envItems.end(), [key](EnvironmentItem &item) {
return item.name == key;
});
if (confEnv != envItems.end())