Commit 6dae14c6 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

don't clobber GenericMakeStep.BuildTargets during expando syntax upgrade

deal with lists of strings here as well

Task-number: QTCREATORBUG-3260
parent fc31b812
......@@ -1808,7 +1808,7 @@ static const char * const varExpandedKeys[] = {
};
// Translate old-style ${} var expansions into new-style %{} ones
static QVariant version8VarNodeHandler(const QVariant &var)
static QVariant version8VarNodeTransform(const QVariant &var)
{
static const char * const vars[] = {
"absoluteFilePath",
......@@ -1845,6 +1845,17 @@ static QVariant version8VarNodeHandler(const QVariant &var)
return QVariant(str);
}
static QVariant version8VarNodeHandler(const QVariant &var)
{
if (var.type() != QVariant::List)
return version8VarNodeTransform(var);
QVariantList vl;
foreach (const QVariant &svar, var.toList())
vl << version8VarNodeTransform(svar);
return vl;
}
QVariantMap Version8Handler::update(Project *, const QVariantMap &map)
{
const char * const *p1 = argListKeys;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment