diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-18 10:55:10 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-28 13:02:21 +0000 |
| commit | 84a595da2d9c5ff1bd07b23be64416ab991d41c7 (patch) | |
| tree | 34a40ed1f4a65520c12c31566aca9321218c5d2a /src/shared/proparser | |
| parent | 87c86c7bdb584641994a6488e3c6ae919763058b (diff) | |
make some messages less ambiguous
Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/7dcc2b3246bba323e8da8d1af5a4f87e82c0e9e0)
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/qmakeparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/proparser/qmakeparser.cpp b/src/shared/proparser/qmakeparser.cpp index 0c4cdf7b574..0a30731789a 100644 --- a/src/shared/proparser/qmakeparser.cpp +++ b/src/shared/proparser/qmakeparser.cpp @@ -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); |