AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't complain about missing include()s during cumulative evaluation

Browse Source 
it produces simply too many false positives.

Change-Id: I3dfa109866450babe5c16f84665ad22024d99e42
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/08bae158320f6d73bf44fcf43f45f51a01334544)
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2013-08-08 18:01:22 +02:00 committed by Oswald Buddenhagen
parent 3f723ff9a9
commit bbf2f1dbbf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/library/qmakebuiltins.cpp
View File

@ -1387,6 +1387,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
} }
QString parseInto; QString parseInto;
LoadFlags flags = 0; LoadFlags flags = 0;
if (m_cumulative)
flags = LoadSilent;
if (args.count() >= 2) { if (args.count() >= 2) {
parseInto = args.at(1).toQString(m_tmp2); parseInto = args.at(1).toQString(m_tmp2);
if (args.count() >= 3 && isTrue(args.at(2), m_tmp3)) if (args.count() >= 3 && isTrue(args.at(2), m_tmp3))