From 15981b985fa3ae250af22f68ddb50e08bd9ce421 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 24 Jul 2013 19:45:58 +0200
Subject: complain about absent files to -pro argument (in lupdate)

this doesn't actually do anything in qmake.

Change-Id: I908fc3792bdc321370e51be98adf7a9c81e37a85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/e1f3732197ef77a29cb7f3c1ce094b3f31a7b689)
(cherry picked from qttools/226f013441990aa4a58f7c82e284057cff659959)
---
 qmake/library/qmakeparser.cpp | 8 ++++----
 qmake/library/qmakeparser.h   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'qmake')

diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp
index 67594625dc..0de3804764 100644
--- a/qmake/library/qmakeparser.cpp
+++ b/qmake/library/qmakeparser.cpp
@@ -184,7 +184,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 {
@@ -205,7 +205,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;
         }
@@ -230,12 +230,12 @@ void QMakeParser::discardFileFromCache(const QString &fileName)
         m_cache->discardFile(fileName);
 }
 
-bool QMakeParser::read(ProFile *pro)
+bool QMakeParser::read(ProFile *pro, ParseFlags flags)
 {
     QString content;
     QString errStr;
     if (!m_vfs->readFile(pro->fileName(), &content, &errStr)) {
-        if (m_handler && m_vfs->exists(pro->fileName()))
+        if (m_handler && ((flags & ParseReportMissing) || m_vfs->exists(pro->fileName())))
             m_handler->message(QMakeParserHandler::ParserIoError,
                                fL1S("Cannot read %1: %2").arg(pro->fileName(), errStr));
         return false;
diff --git a/qmake/library/qmakeparser.h b/qmake/library/qmakeparser.h
index e9b0b76b3c..baf0a12045 100644
--- a/qmake/library/qmakeparser.h
+++ b/qmake/library/qmakeparser.h
@@ -89,7 +89,8 @@ public:
 
     enum ParseFlag {
         ParseDefault = 0,
-        ParseUseCache = 1
+        ParseUseCache = 1,
+        ParseReportMissing = 2
     };
     Q_DECLARE_FLAGS(ParseFlags, ParseFlag)
 
@@ -136,7 +137,7 @@ private:
         ushort terminator; // '}' if replace function call is braced, ':' if test function
     };
 
-    bool read(ProFile *pro);
+    bool read(ProFile *pro, ParseFlags flags);
     bool read(ProFile *pro, const QString &content, int line, SubGrammar grammar);
 
     ALWAYS_INLINE void putTok(ushort *&tokPtr, ushort tok);
-- 
cgit v1.2.3