From 3d960a16dc91d8eb8f193477d6d771ed1b7905c2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Aug 2013 15:54:29 +0200 Subject: [PATCH] don't print warnings from parser & evaluator they are pretty much noise in lupdate context. we still print error messages: the ones from the parser are always genuine, while the ones from the evaluator are at least occasionally helpful. Task-number: QTBUG-28159 Change-Id: I6cdb11b51c0a3f569ec430f98a0068f933db903d Reviewed-by: Joerg Bornemann --- src/linguist/lrelease/main.cpp | 5 ++++- src/linguist/lupdate/main.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 08d6b42..2d6b60a 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -205,7 +205,10 @@ static void print(const QString &fileName, int lineNo, int type, const QString & class EvalHandler : public QMakeHandler { public: virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) - { if (verbose) print(fileName, lineNo, type, msg); } + { + if (verbose && (type & CategoryMask) == ErrorMessage) + print(fileName, lineNo, type, msg); + } virtual void fileMessage(const QString &) {} diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index 4992b4e..70402e5 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -247,7 +247,10 @@ static void print(const QString &fileName, int lineNo, int type, const QString & class EvalHandler : public QMakeHandler { public: virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) - { if (verbose) print(fileName, lineNo, type, msg); } + { + if (verbose && (type & CategoryMask) == ErrorMessage) + print(fileName, lineNo, type, msg); + } virtual void fileMessage(const QString &) {} -- 2.7.4