1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make some messages less ambiguous

Browse Source 
Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-02-18 10:55:10 +01:00
parent bec885380a
commit 7dcc2b3246
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/library/qmakeparser.cpp
View File

@ -672,7 +672,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
FLUSH_LHS_LITERAL(); FLUSH_LHS_LITERAL();
finalizeCond(tokPtr, buf, ptr, wordCount); finalizeCond(tokPtr, buf, ptr, wordCount);
if (m_state == StNew) if (m_state == StNew)
parseError(fL1S("And operator without prior condition.")); parseError(fL1S("AND operator without prior condition."));
else else
m_operator = AndOperator; m_operator = AndOperator;
nextItem: nextItem:
@ -682,7 +682,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
FLUSH_LHS_LITERAL(); FLUSH_LHS_LITERAL();
finalizeCond(tokPtr, buf, ptr, wordCount); finalizeCond(tokPtr, buf, ptr, wordCount);
if (m_state != StCond) if (m_state != StCond)
parseError(fL1S("Or operator without prior condition.")); parseError(fL1S("OR operator without prior condition."));
else else
m_operator = OrOperator; m_operator = OrOperator;
goto nextItem; goto nextItem;
@ -1062,7 +1062,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg
defType = TokTestDef; defType = TokTestDef;
deffunc: deffunc:
if (m_invert) { if (m_invert) {
bogusTest(tokPtr, fL1S("Unexpected operator in front of function definition.")); bogusTest(tokPtr, fL1S("Unexpected NOT operator in front of function definition."));
return; return;
} }
flushScopes(tokPtr); flushScopes(tokPtr);