feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't send output of $$join() and $$sprintf() through split_value_list()

Browse Source 
in the case of sprintf it's surprising, in the case of join it's
anti-thetical.

Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/ae94bf2b7a6373def9239ae5f54b143e1f6ffe09)
This commit is contained in:
Oswald Buddenhagen
2013-03-12 21:48:12 +01:00
parent bb64e06a05
commit a64eac0a74
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -460,8 +460,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));
// Note: this depends on split_value_list() making a deep copy
ret = split_value_list(tmp);
ret << ProString(tmp);
}
break;
case E_FORMAT_NUMBER:
@@ -554,7 +553,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
src = s;
break;
}
ret = split_value_list(before + var.join(glue) + after, src);
ret << ProString(before + var.join(glue) + after).setSource(src);
}
}
break;