diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-24 19:49:38 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-26 14:35:00 +0200 |
commit | eff4a5dcee0288bfdb8056d74a01ec19ca428be9 (patch) | |
tree | 2dff9ae970b2986d972a74a46b30dc1ade075595 /src/shared/proparser | |
parent | 7a707eb2ce7362aacca5cc986e728db146fe0e0e (diff) | |
download | qt-creator-eff4a5dcee0288bfdb8056d74a01ec19ca428be9.tar.gz |
change reporting of missing files
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)
Diffstat (limited to 'src/shared/proparser')
-rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 9f6b8bf01e..20196eb023 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1804,7 +1804,10 @@ ProString QMakeEvaluator::first(const ProKey &variableName) const QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile( 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); VisitReturn ok = visitProFile(pro, type, flags); m_current = m_locationStack.pop(); @@ -1819,8 +1822,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFile( #endif return ok; } else { - if (!(flags & LoadSilent) && !m_vfs->exists(fileName)) - evalError(fL1S("WARNING: Include file %1 not found").arg(fileName)); return ReturnFalse; } } |