diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-18 10:55:10 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-25 13:54:55 +0000 |
commit | 7dcc2b3246bba323e8da8d1af5a4f87e82c0e9e0 (patch) | |
tree | eef9bbef402c14d570109ef2d0879ad0e4abefeb /qmake/library/qmakeparser.cpp | |
parent | bec885380a091dc0b37b372acf88cc3d17c80779 (diff) |
make some messages less ambiguous
Change-Id: I6032fdc1c1e6b1fb852da09e47990de03966fa3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/library/qmakeparser.cpp')
-rw-r--r-- | qmake/library/qmakeparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index 8094e3a9a7..6eff04278f 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/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); |