diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-17 16:27:23 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 13:44:34 +0000 |
| commit | 8f82ee1c04cebd2825925a7be71f5f9523a1779b (patch) | |
| tree | 8295027b1a26a9bd38a76cdaaaef8c9a726d2b4e /qmake | |
| parent | a7ddef139415f74f9ba8dc84a2f15105149ca5e8 (diff) | |
report cumulativity of $$system() and evaluator error output as well
so far, we "downgraded" only explicit error() output, but other errors
may happen as well while doing semi-exact evaluation of .prf files - at
least hypothetically.
amends 08d0cb6f8e.
Change-Id: I32819a569dbed2dbdb37c5c23bf4a5a18d3c64ea
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qttools/ea1a5c3534f089c0e704808a0fb029eda8f753b4)
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 4 | ||||
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 9fc6603075..8f3849e6d8 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -406,7 +406,9 @@ QByteArray QMakeEvaluator::getCommandOutput(const QString &args) const if (!errout.isEmpty()) { if (errout.endsWith('\n')) errout.chop(1); - m_handler->message(QMakeHandler::EvalError, QString::fromLocal8Bit(errout)); + m_handler->message( + QMakeHandler::EvalError | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), + QString::fromLocal8Bit(errout)); } # endif out = proc.readAllStandardOutput(); diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 48bd17e789..cd5676093d 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -2034,7 +2034,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFileInto( void QMakeEvaluator::message(int type, const QString &msg) const { if (!m_skipLevel) - m_handler->message(type, msg, + m_handler->message(type | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), msg, m_current.line ? m_current.pro->fileName() : QString(), m_current.line != 0xffff ? m_current.line : -1); } |