1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix qmake's pro file cache to interact correctly with write_file

Browse Source 
When writing a file with write_file() we have to inform the pro file parser
cache to discard the file if it's existant in the cache, to ensure that
calling include() after write_file() always works.

Change-Id: I7d09269a57de55ca30b0e11dd40770de9f919f64
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Simon Hausmann 2012-10-25 10:55:00 +02:00 committed by The Qt Project
parent 79a389c346
commit f45d6414ad
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/library/qmakebuiltins.cpp
View File

@ -320,6 +320,7 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open
.arg(ctx, QDir::toNativeSeparators(qfi.filePath()), errStr)); .arg(ctx, QDir::toNativeSeparators(qfi.filePath()), errStr));
return ReturnFalse; return ReturnFalse;
} }
m_parser->discardFileFromCache(qfi.filePath());
return ReturnTrue; return ReturnTrue;
} }

6
qmake/library/qmakeparser.cpp
View File

@ -222,6 +222,12 @@ ProFile *QMakeParser::parsedProBlock(
return pro; return pro;
} }
void QMakeParser::discardFileFromCache(const QString &fileName)
{
if (m_cache)
m_cache->discardFile(fileName);
}
bool QMakeParser::read(ProFile *pro) bool QMakeParser::read(ProFile *pro)
{ {
QFile file(pro->fileName()); QFile file(pro->fileName());

2
qmake/library/qmakeparser.h
View File

@ -94,6 +94,8 @@ public:
ProFile *parsedProBlock(const QString &contents, const QString &name, int line = 0, ProFile *parsedProBlock(const QString &contents, const QString &name, int line = 0,
SubGrammar grammar = FullGrammar); SubGrammar grammar = FullGrammar);
void discardFileFromCache(const QString &fileName);
private: private:
enum ScopeNesting { enum ScopeNesting {
NestNone = 0, NestNone = 0,

19
tests/auto/tools/qmake/testdata/pro_file_cache/pro_file_cache.pro vendored Normal file
View File

@ -0,0 +1,19 @@
TEMPLATE = app
CONFIG -= debug_and_release_target
SOURCES =
content = ""
write_file("include.pri", content)
include(include.pri)
content = "SOURCES = main.cpp"
write_file("include.pri", content)
include(include.pri)
# Make sure that including the .pri file a second time will reload it properly
# off disk with the new content.
isEmpty(SOURCES): error(No sources defined)
# Empty it again to silence qmake about non-existance sources
SOURCES =

7
tests/auto/tools/qmake/tst_qmake.cpp
View File

@ -92,6 +92,7 @@ private slots:
void includefunction(); void includefunction();
void substitutes(); void substitutes();
void project(); void project();
void proFileCache();
private: private:
TestCompiler test_compiler; TestCompiler test_compiler;
@ -546,5 +547,11 @@ void tst_qmake::project()
QVERIFY( test_compiler.removeProject( workDir, "project" )); QVERIFY( test_compiler.removeProject( workDir, "project" ));
} }
void tst_qmake::proFileCache()
{
QString workDir = base_path + "/testdata/pro_file_cache";
QVERIFY( test_compiler.qmake( workDir, "pro_file_cache" ));
}
QTEST_MAIN(tst_qmake) QTEST_MAIN(tst_qmake)
#include "tst_qmake.moc" #include "tst_qmake.moc"