diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 09:55:55 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 16:01:53 (GMT) |
| commit | 4ef666941209530ef266a34c3b32dc07642eef9a (patch) | |
| tree | 73a6889e3fc04aee830601d712eead7bbfb29052 /tools | |
| parent | 0c508410dd42714b9854b523c851ef699ebcf7d7 (diff) | |
| download | Qt-4ef666941209530ef266a34c3b32dc07642eef9a.zip Qt-4ef666941209530ef266a34c3b32dc07642eef9a.tar.gz Qt-4ef666941209530ef266a34c3b32dc07642eef9a.tar.bz2 | |
fix wrong evaluation of arguments to qmake functions
cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index aa529c1..eb6e2a7 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1002,9 +1002,10 @@ bool ProFileEvaluator::Private::isActiveConfig(const QString &config, bool regex QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &func, const QString &arguments) { QStringList argumentsList = split_arg_list(arguments); + QStringList args; 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, E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, |