AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix $$section()'s bad argument count error message

Browse Source 
the autotest was also broken, because it was created by pasting the
bogus message into the result ...

Change-Id: I02b8663b96c7d96cdb3c19639e2213e49fd2bcec
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-11-09 13:11:31 +01:00
parent 839cae0422
commit 8db556d299
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/library/qmakebuiltins.cpp
View File

@ -478,8 +478,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
int end = -1;
if (func_t == E_SECTION) {
if (args.count() != 3 && args.count() != 4) {
evalError(fL1S("%1(var) section(var, sep, begin, end) requires"
" three or four arguments.").arg(func.toQString(m_tmp1)));
evalError(fL1S("section(var, sep, begin, end) requires three or four arguments."));
} else {
var = args[0];
sep = args.at(1).toQString();

4
tests/auto/tools/qmakelib/evaltest.cpp
View File

@ -1125,8 +1125,8 @@ void tst_qmakelib::addReplaceFunctions(const QString &qindir)
QTest::newRow("$$section(): bad number of arguments")
<< "VAR = $$section(1, 2) \\\n$$section(1, 2, 3, 4, 5)"
<< "VAR ="
<< "##:1: section(var) section(var, sep, begin, end) requires three or four arguments.\n"
"##:2: section(var) section(var, sep, begin, end) requires three or four arguments."
<< "##:1: section(var, sep, begin, end) requires three or four arguments.\n"
"##:2: section(var, sep, begin, end) requires three or four arguments."
<< true;
QTest::newRow("$$find()")