From 08d0cb6f8e90a818bf6d3bec7a6d00f16419b8c0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 2 Sep 2013 16:43:49 +0200 Subject: [PATCH] print project errors after all. sometimes. we evaluate prf files precisely, so we need to see their errors, as they may give a hint why they terminated prematurely. however, we prefix the errors with "WARNING:" to make them less scary. Change-Id: Ia14953a5a9dc31af56ad6c338017dd5b85bb4494 Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- src/linguist/lrelease/main.cpp | 8 +++++++- src/linguist/lupdate/main.cpp | 8 +++++++- src/linguist/shared/qmakebuiltins.cpp | 8 ++++++-- src/linguist/shared/qmakeevaluator.h | 4 +++- src/linguist/shared/qmakeparser.h | 5 +++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 3239d47..26d9c89 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -209,7 +209,13 @@ public: print(fileName, lineNo, msg); } - virtual void fileMessage(const QString &) {} + virtual void fileMessage(int type, const QString &msg) + { + if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage) { + // "Downgrade" errors, as we don't really care for them + printErr(QLatin1String("WARNING: ") + msg + QLatin1Char('\n')); + } + } virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {} virtual void doneWithEval(ProFile *) {} diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index 74eab78..001841b 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -252,7 +252,13 @@ public: print(fileName, lineNo, msg); } - virtual void fileMessage(const QString &) {} + virtual void fileMessage(int type, const QString &msg) + { + if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage) { + // "Downgrade" errors, as we don't really care for them + printErr(QLatin1String("WARNING: ") + msg + QLatin1Char('\n')); + } + } virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {} virtual void doneWithEval(ProFile *) {} diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp index 4712df5..8750b76 100644 --- a/src/linguist/shared/qmakebuiltins.cpp +++ b/src/linguist/shared/qmakebuiltins.cpp @@ -1360,8 +1360,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( fputs(msg.toLatin1().constData(), stderr); #endif } else { - m_handler->fileMessage(fL1S("Project %1: %2") - .arg(function.toQString(m_tmp1).toUpper(), msg)); + m_handler->fileMessage( + (func_t == T_ERROR ? QMakeHandler::ErrorMessage : + func_t == T_WARNING ? QMakeHandler::WarningMessage : + QMakeHandler::InfoMessage) + | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), + fL1S("Project %1: %2").arg(function.toQString(m_tmp1).toUpper(), msg)); } } return (func_t == T_ERROR && !m_cumulative) ? ReturnError : ReturnTrue; diff --git a/src/linguist/shared/qmakeevaluator.h b/src/linguist/shared/qmakeevaluator.h index 13198c3..8a10722 100644 --- a/src/linguist/shared/qmakeevaluator.h +++ b/src/linguist/shared/qmakeevaluator.h @@ -73,6 +73,8 @@ public: enum { SourceEvaluator = 0x10, + CumulativeEvalMessage = 0x1000, + EvalWarnLanguage = SourceEvaluator | WarningMessage | WarnLanguage, EvalWarnDeprecated = SourceEvaluator | WarningMessage | WarnDeprecated, @@ -80,7 +82,7 @@ public: }; // error(), warning() and message() from .pro file - virtual void fileMessage(const QString &msg) = 0; + virtual void fileMessage(int type, const QString &msg) = 0; enum EvalFileType { EvalProjectFile, EvalIncludeFile, EvalConfigFile, EvalFeatureFile, EvalAuxFile }; virtual void aboutToEval(ProFile *parent, ProFile *proFile, EvalFileType type) = 0; diff --git a/src/linguist/shared/qmakeparser.h b/src/linguist/shared/qmakeparser.h index dd55659..15897cf 100644 --- a/src/linguist/shared/qmakeparser.h +++ b/src/linguist/shared/qmakeparser.h @@ -58,8 +58,9 @@ class QMAKE_EXPORT QMakeParserHandler public: enum { CategoryMask = 0xf00, - WarningMessage = 0x000, - ErrorMessage = 0x100, + InfoMessage = 0x100, + WarningMessage = 0x200, + ErrorMessage = 0x300, SourceMask = 0xf0, SourceParser = 0, -- 2.7.4