diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-25 10:55:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 14:03:29 +0100 |
| commit | 10b2503195dc0d8a98f365e59c7acb602ae4ab3a (patch) | |
| tree | 0353b32d0ba76e05a3c7abe94f18295164a15d05 /src/linguist/shared/qmakeparser.cpp | |
| parent | 9ecbf6fb5a2546507721d112653210e1030e66f3 (diff) | |
Fix qmake's pro file cache to interact correctly with write_file
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>
(cherry picked from qtbase/f45d6414ad6ef1d75f049a61411cd954bcae29c3)
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/linguist/shared/qmakeparser.cpp')
| -rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index f9b47d6d9..5deb6b6d7 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -216,6 +216,12 @@ ProFile *QMakeParser::parsedProBlock( return pro; } +void QMakeParser::discardFileFromCache(const QString &fileName) +{ + if (m_cache) + m_cache->discardFile(fileName); +} + bool QMakeParser::read(ProFile *pro) { QFile file(pro->fileName()); |