diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-15 16:07:01 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 19:40:51 +0100 |
| commit | 96cf50b2ffad530caa41afad13d4e64b2fc6fcf7 (patch) | |
| tree | f2cbda2ff16fa03789049bf3705a3cdc88ccf187 /src/linguist/shared/profileevaluator.cpp | |
| parent | 4734b0dc2a7c4445533793027c6d8e479a1f250f (diff) | |
| download | qttools-96cf50b2ffad530caa41afad13d4e64b2fc6fcf7.tar.gz | |
make $$join() implementation qmake-compliant
Task-number: QTCREATORBUG-6441
Change-Id: I1d18c81f76cda71654a85c23b7b53b4aae0d51c6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 555e539760998fcff1e3117abc5080c4fee47275)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/linguist/shared/profileevaluator.cpp')
| -rw-r--r-- | src/linguist/shared/profileevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/shared/profileevaluator.cpp b/src/linguist/shared/profileevaluator.cpp index a0090c96d..6f7fae8a6 100644 --- a/src/linguist/shared/profileevaluator.cpp +++ b/src/linguist/shared/profileevaluator.cpp @@ -2278,7 +2278,7 @@ ProStringList ProFileEvaluator::Private::evaluateExpandFunction( src = s; break; } - ret.append(ProString(before + var.join(glue) + after, NoHash).setSource(src)); + ret = split_value_list(before + var.join(glue) + after, src); } } break; |