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

CMakePM: Merge cacheVariables, environment for inherited presets

Browse Source 
cacheVariables, environment (and others) collection fields need to be
merged when having inherited presets.

Fixes: QTCREATORBUG-28360
Change-Id: I3d2b84355fad9ffa2dc4629ece7d42f7b482a859
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam
2022-10-22 23:50:46 +02:00
parent 0944bfb7f0
commit 869597884d
1 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/cmakeprojectmanager/presetsparser.cpp
View File

@@ -441,6 +441,34 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
return true; return true;
} }
static QHash<QString, QString> merge(const QHash<QString, QString> &first,
const QHash<QString, QString> &second)
{
QHash<QString, QString> result = first;
for (auto it = second.constKeyValueBegin(); it != second.constKeyValueEnd(); ++it) {
result[it->first] = it->second;
}
return result;
}
static CMakeConfig merge(const CMakeConfig &first, const CMakeConfig &second)
{
return Utils::setUnionMerge<CMakeConfig>(
first,
second,
[](const auto & /*left*/, const auto &right) { return right; },
&CMakeConfigItem::less);
}
static QStringList merge(const QStringList &first, const QStringList &second)
{
return Utils::setUnionMerge<QStringList>(
first,
second,
[](const auto & /*left*/, const auto &right) { return right; });
}
void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other) void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
{ {
if (!condition && other.condition && !other.condition.value().isNull()) if (!condition && other.condition && !other.condition.value().isNull())
@@ -449,6 +477,9 @@ void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
if (!vendor && other.vendor) if (!vendor && other.vendor)
vendor = other.vendor; vendor = other.vendor;
if (vendor && other.vendor)
vendor = merge(other.vendor.value(), vendor.value());
if (!generator && other.generator) if (!generator && other.generator)
generator = other.generator; generator = other.generator;
@@ -472,9 +503,13 @@ void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
if (!cacheVariables && other.cacheVariables) if (!cacheVariables && other.cacheVariables)
cacheVariables = other.cacheVariables; cacheVariables = other.cacheVariables;
else if (cacheVariables && other.cacheVariables)
cacheVariables = merge(other.cacheVariables.value(), cacheVariables.value());
if (!environment && other.environment) if (!environment && other.environment)
environment = other.environment; environment = other.environment;
else if (environment && other.environment)
environment = merge(other.environment.value(), environment.value());
if (!warnings && other.warnings) if (!warnings && other.warnings)
warnings = other.warnings; warnings = other.warnings;
@@ -494,8 +529,13 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
if (!vendor && other.vendor) if (!vendor && other.vendor)
vendor = other.vendor; vendor = other.vendor;
if (vendor && other.vendor)
vendor = merge(other.vendor.value(), vendor.value());
if (!environment && other.environment) if (!environment && other.environment)
environment = other.environment; environment = other.environment;
else if (environment && other.environment)
environment = merge(other.environment.value(), environment.value());
if (!configurePreset && other.configurePreset) if (!configurePreset && other.configurePreset)
configurePreset = other.configurePreset; configurePreset = other.configurePreset;
@@ -508,6 +548,8 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
if (!targets && other.targets) if (!targets && other.targets)
targets = other.targets; targets = other.targets;
else if (targets && other.targets)
targets = merge(other.targets.value(), targets.value());
if (!configuration && other.configuration) if (!configuration && other.configuration)
configuration = other.configuration; configuration = other.configuration;
@@ -520,6 +562,8 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
if (!nativeToolOptions && other.nativeToolOptions) if (!nativeToolOptions && other.nativeToolOptions)
nativeToolOptions = other.nativeToolOptions; nativeToolOptions = other.nativeToolOptions;
else if (nativeToolOptions && other.nativeToolOptions)
nativeToolOptions = merge(other.nativeToolOptions.value(), nativeToolOptions.value());
} }
bool PresetsDetails::Condition::evaluate() const bool PresetsDetails::Condition::evaluate() const