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

complain about absent files to -pro argument (in lupdate)

Browse Source 
sync up; this doesn't actually do anything in creator (or qmake).

Change-Id: I908fc3792bdc321370e51be98adf7a9c81e37a85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/15981b985fa3ae250af22f68ddb50e08bd9ce421)
This commit is contained in:
Oswald Buddenhagen
2013-07-24 19:45:58 +02:00
parent 41b1684a6d
commit 7a707eb2ce
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/proparser/qmakeparser.cpp
View File

@@ -172,7 +172,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 {
@@ -193,7 +193,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;
}
@@ -218,12 +218,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;

5
src/shared/proparser/qmakeparser.h
View File

@@ -77,7 +77,8 @@ public:
enum ParseFlag {
ParseDefault = 0,
ParseUseCache = 1
ParseUseCache = 1,
ParseReportMissing = 2
};
Q_DECLARE_FLAGS(ParseFlags, ParseFlag)
@@ -124,7 +125,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);