Merge remote-tracking branch 'origin/9.0'

Change-Id: Idd9c2b1bf787040b7b415b7cda29035227ca1011
This commit is contained in:
Eike Ziller
2022-11-21 08:57:14 +01:00
9 changed files with 491 additions and 428 deletions

View File

@@ -163,7 +163,7 @@ void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData)
TaskHub::requestPopup();
}
const QString &configurePresetName = buildPreset.configurePreset.value();
const QString &configurePresetName = buildPreset.configurePreset.value_or(QString());
buildPreset.environment
= Utils::findOrDefault(presetsData.configurePresets,
[configurePresetName](