summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-08-08 18:01:22 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-19 18:46:39 +0200
commit08bae158320f6d73bf44fcf43f45f51a01334544 (patch)
tree83f9f9e541a24c60ab2da548924c1179d1f12f80
parentdd4d594c787a62fa8aa12695c5d115c71b59bacd (diff)
downloadqttools-08bae158320f6d73bf44fcf43f45f51a01334544.tar.gz
don't complain about missing include()s during cumulative evaluation
it produces simply too many false positives. Change-Id: I3dfa109866450babe5c16f84665ad22024d99e42 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/linguist/shared/qmakebuiltins.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index 37ab82ff3..a48395baa 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -1302,6 +1302,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
}
QString parseInto;
LoadFlags flags = 0;
+ if (m_cumulative)
+ flags = LoadSilent;
if (args.count() >= 2) {
parseInto = args.at(1).toQString(m_tmp2);
if (args.count() >= 3 && isTrue(args.at(2), m_tmp3))