forked from qt-creator/qt-creator
Fixes: Wrong evaluation of arguments to qmake functions
Task: 247606 RevBy: analysis and bug fix mostly by ossi Details: More fixes might be needed.
This commit is contained in:
@@ -1193,9 +1193,10 @@ bool ProFileEvaluator::Private::isActiveConfig(const QString &config, bool regex
|
|||||||
QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &func, const QString &arguments)
|
QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &func, const QString &arguments)
|
||||||
{
|
{
|
||||||
QStringList argumentsList = split_arg_list(arguments);
|
QStringList argumentsList = split_arg_list(arguments);
|
||||||
|
|
||||||
QStringList args;
|
QStringList args;
|
||||||
for (int i = 0; i < argumentsList.count(); ++i)
|
for (int i = 0; i < argumentsList.count(); ++i)
|
||||||
args += expandVariableReferences(argumentsList[i]);
|
args += expandVariableReferences(argumentsList[i]).join(Option::field_sep);
|
||||||
|
|
||||||
enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST,
|
enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST,
|
||||||
E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
|
E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
|
||||||
|
|||||||
Reference in New Issue
Block a user