make $$join() implementation qmake-compliant
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 15 Nov 2011 15:07:01 +0000 (16:07 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 13 Dec 2011 18:40:51 +0000 (19:40 +0100)
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>

src/linguist/shared/profileevaluator.cpp

index a0090c9..6f7fae8 100644 (file)
@@ -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;