don't send output of $$join() and $$sprintf() through split_value_list()
in the case of sprintf it's surprising, in the case of join it's anti-thetical. Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
898e701b4a
commit
ae94bf2b7a
@ -467,8 +467,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
|
||||
QString tmp = args.at(0).toQString(m_tmp1);
|
||||
for (int i = 1; i < args.count(); ++i)
|
||||
tmp = tmp.arg(args.at(i).toQString(m_tmp2));
|
||||
// Note: this depends on split_value_list() making a deep copy
|
||||
ret = split_value_list(tmp);
|
||||
ret << ProString(tmp);
|
||||
}
|
||||
break;
|
||||
case E_FORMAT_NUMBER:
|
||||
@ -561,7 +560,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
|
||||
src = s;
|
||||
break;
|
||||
}
|
||||
ret = split_value_list(before + var.join(glue) + after, src);
|
||||
ret << ProString(before + var.join(glue) + after).setSource(src);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user