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-10-25 16:22:00 +0200 |
| commit | f45d6414ad6ef1d75f049a61411cd954bcae29c3 (patch) | |
| tree | ebde425c3c7b2dab39227f49d5ea460d9088fc14 /qmake/library/qmakebuiltins.cpp | |
| parent | 79a389c34618880fab7a0b4f397ed3b0f0c0c675 (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>
Diffstat (limited to 'qmake/library/qmakebuiltins.cpp')
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 4d4f6d9793..bafa867f8b 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -320,6 +320,7 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open .arg(ctx, QDir::toNativeSeparators(qfi.filePath()), errStr)); return ReturnFalse; } + m_parser->discardFileFromCache(qfi.filePath()); return ReturnTrue; } |