diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-11 09:14:22 +0100 |
| commit | b03a981a411a7b93b5280d4e42faa8357854e638 (patch) | |
| tree | f91fb763dde57b15634673c4d58bd32f8999a886 /src/shared | |
| parent | 1f0665a3e2f0f33b43a492afac54d7300d65378f (diff) | |
| parent | cdc2a0f72334268684e0407e9b04b3188e00d4bf (diff) | |
| download | qt-creator-b03a981a411a7b93b5280d4e42faa8357854e638.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 0cf81ce30c..d51b476d8d 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -508,7 +508,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)); - ret << ProString(tmp); + ret << (tmp.isSharedWith(m_tmp1) ? args.at(0) : ProString(tmp).setSource(args.at(0))); } break; case E_FORMAT_NUMBER: @@ -1526,7 +1526,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( if (args.count() >= 2) { const ProStringList &vals = values(args.at(1).toKey()); if (!vals.isEmpty()) - contents = vals.join(fL1S("\n")) + QLatin1Char('\n'); + contents = vals.join(QLatin1Char('\n')) + QLatin1Char('\n'); if (args.count() >= 3) if (!args.at(2).toQString(m_tmp1).compare(fL1S("append"), Qt::CaseInsensitive)) mode = QIODevice::Append; |