Commit f269f869 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

don't double-expand for() arguments

unlike in qmake, the arguments are already expanded at this point
(which is strictly speaking a bug for the iterator variable name),
so it is plain wrong to call doVariableReplace on them.
parent 2af6e73c
......@@ -2464,7 +2464,6 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
loop.index = 0;
QString it_list;
if (args.count() == 1) {
doVariableReplace(&args[0]);
it_list = args[0];
if (args[0] != statics.strever) {
logMessage(format("for({var, list|var, forever|ever})"
......@@ -2475,7 +2474,6 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
} else {
loop.variable = map(args.at(0));
loop.oldVarVal = valuesDirect(loop.variable);
doVariableReplace(&args[1]);
it_list = map(args.at(1));
}
loop.list = valuesDirect(it_list);
......
Supports Markdown
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