From c3b8342670a47fee230209ba5de31e0a748a523c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Feb 2015 10:55:10 +0100 Subject: make some messages less ambiguous Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c Reviewed-by: Joerg Bornemann (cherry picked from qtbase/7dcc2b3246bba323e8da8d1af5a4f87e82c0e9e0) --- src/linguist/shared/qmakeparser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index 2820f76f7..9f332315c 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -672,7 +672,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: @@ -682,7 +682,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; @@ -1062,7 +1062,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); -- cgit v1.2.3