Commit 84a595da authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

make some messages less ambiguous



Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/7dcc2b3246bba323e8da8d1af5a4f87e82c0e9e0)
parent 87c86c7b
......@@ -692,7 +692,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
FLUSH_LHS_LITERAL();
finalizeCond(tokPtr, buf, ptr, wordCount);
if (m_state == StNew)
parseError(fL1S("And operator without prior condition."));
parseError(fL1S("AND operator without prior condition."));
else
m_operator = AndOperator;
nextItem:
......@@ -702,7 +702,7 @@ void QMakeParser::read(ProFile *pro, const QString &in, int line, SubGrammar gra
FLUSH_LHS_LITERAL();
finalizeCond(tokPtr, buf, ptr, wordCount);
if (m_state != StCond)
parseError(fL1S("Or operator without prior condition."));
parseError(fL1S("OR operator without prior condition."));
else
m_operator = OrOperator;
goto nextItem;
......@@ -1082,7 +1082,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg
defType = TokTestDef;
deffunc:
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;
}
flushScopes(tokPtr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment