feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

change reporting of missing files

Browse Source 
use the new parser flags to report all i/o errors directly.

as a notable side effect, the "WARNING" prefix is gone (even though
it is still treated like that, which is mildly insane to start with).

Change-Id: I084375d5e7a3314ae763795f7c318804a9fb84b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/b4c0d9166e7a8f5dfa5ca052002a5ab318787aa2)
This commit is contained in:
Oswald Buddenhagen
2013-07-24 19:49:38 +02:00
parent 7a707eb2ce
commit eff4a5dcee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1804,7 +1804,10 @@ ProString QMakeEvaluator::first(const ProKey &variableName) const
QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile( QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile(
const QString &fileName, QMakeHandler::EvalFileType type, LoadFlags flags) const QString &fileName, QMakeHandler::EvalFileType type, LoadFlags flags)
{ {
if (ProFile *pro = m_parser->parsedProFile(fileName, QMakeParser::ParseUseCache)) { QMakeParser::ParseFlags pflags = QMakeParser::ParseUseCache;
if (!(flags & LoadSilent))
pflags |= QMakeParser::ParseReportMissing;
if (ProFile *pro = m_parser->parsedProFile(fileName, pflags)) {
m_locationStack.push(m_current); m_locationStack.push(m_current);
VisitReturn ok = visitProFile(pro, type, flags); VisitReturn ok = visitProFile(pro, type, flags);
m_current = m_locationStack.pop(); m_current = m_locationStack.pop();
@@ -1819,8 +1822,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile(
#endif #endif
return ok; return ok;
} else { } else {
if (!(flags & LoadSilent) && !m_vfs->exists(fileName))
evalError(fL1S("WARNING: Include file %1 not found").arg(fileName));
return ReturnFalse; return ReturnFalse;
} }
} }