diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:15:55 +0200 |
| commit | 3e949b75fd298a30fa4e8b281ecf21fcb038efbe (patch) | |
| tree | 592bb2d6ca846a9d3aee66bc829d21ae8ba8c056 /qmake/library/qmakeevaluator.cpp | |
| parent | 4518345b80b0ee1101ecb0e7349728abd237aa6e (diff) | |
| parent | d2b4a789c39eb770068b002d2bc9ceb764dedf3d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
qtbase.pro
Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 4c2a6d5335..e828dd85f7 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -2037,7 +2037,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); } |