diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-18 10:55:10 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-18 14:43:54 +0000 |
| commit | c3b8342670a47fee230209ba5de31e0a748a523c (patch) | |
| tree | 74188ff1dbfb0af6fd38f5f7c5cc1be25e050925 | |
| parent | 13a8efa6e906161c8e55fd58326152e3fab29875 (diff) | |
make some messages less ambiguous
Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/7dcc2b3246bba323e8da8d1af5a4f87e82c0e9e0)
| -rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 6 |
1 files 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); |