diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-24 19:45:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-29 17:46:32 +0200 |
| commit | e1f3732197ef77a29cb7f3c1ce094b3f31a7b689 (patch) | |
| tree | e269f043310f162afa08e5f42c0a142d947b093d /src/linguist/shared/qmakeparser.cpp | |
| parent | 066b08fc62c67d586996ea4e272ef05dd3865fac (diff) | |
complain about absent files to -pro argument
Task-number: QTBUG-30618
Change-Id: I908fc3792bdc321370e51be98adf7a9c81e37a85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/linguist/shared/qmakeparser.cpp')
| -rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index 690a1c04b..e73d81412 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -182,7 +182,7 @@ ProFile *QMakeParser::parsedProFile(const QString &fileName, ParseFlags flags) locker.unlock(); #endif pro = new ProFile(fileName); - if (!read(pro)) { + if (!read(pro, flags)) { delete pro; pro = 0; } else { @@ -203,7 +203,7 @@ ProFile *QMakeParser::parsedProFile(const QString &fileName, ParseFlags flags) } } else { pro = new ProFile(fileName); - if (!read(pro)) { + if (!read(pro, flags)) { delete pro; pro = 0; } @@ -228,11 +228,11 @@ void QMakeParser::discardFileFromCache(const QString &fileName) m_cache->discardFile(fileName); } -bool QMakeParser::read(ProFile *pro) +bool QMakeParser::read(ProFile *pro, ParseFlags flags) { QFile file(pro->fileName()); if (!file.open(QIODevice::ReadOnly)) { - if (m_handler && IoUtils::exists(pro->fileName())) + if (m_handler && ((flags && ParseReportMissing) || IoUtils::exists(pro->fileName()))) m_handler->message(QMakeParserHandler::ParserIoError, fL1S("Cannot read %1: %2").arg(pro->fileName(), file.errorString())); return false; |