summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-08-07 15:54:29 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-12 18:15:20 +0200
commit3d960a16dc91d8eb8f193477d6d771ed1b7905c2 (patch)
treed516419e57bee25922025bdb1c0bda2efb0dc864
parent7ca8ec47bdabbac2565877db450a6d385cf5081c (diff)
downloadqttools-3d960a16dc91d8eb8f193477d6d771ed1b7905c2.tar.gz
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 <joerg.bornemann@digia.com>
-rw-r--r--src/linguist/lrelease/main.cpp5
-rw-r--r--src/linguist/lupdate/main.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index 08d6b4287..2d6b60a4a 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 4992b4eb0..70402e5bc 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 &) {}