Fix qmake's pro file cache to interact correctly with write_file
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 25 Oct 2012 08:55:00 +0000 (10:55 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 5 Nov 2012 13:03:29 +0000 (14:03 +0100)
commit10b2503195dc0d8a98f365e59c7acb602ae4ab3a
tree0353b32d0ba76e05a3c7abe94f18295164a15d05
parent9ecbf6fb5a2546507721d112653210e1030e66f3
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>
src/linguist/shared/qmakebuiltins.cpp
src/linguist/shared/qmakeparser.cpp
src/linguist/shared/qmakeparser.h