diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-29 20:18:51 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-07 13:58:41 +0200 |
| commit | b215176da34661969015e4950815fe8297885163 (patch) | |
| tree | 24b1e3993cb44e4c7713061ce2d788eaedd7d9b6 /qmake/main.cpp | |
| parent | 45ab9d0c336f686d009061893dd8144eacd90040 (diff) | |
implement simple VFS to support caching during project parsing
sync up with qt creator - for qmake itself, this is just a minor
refactoring.
Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/66802ef8bf7989dc025e34bf91d93576189c483c)
(cherry picked from qtcreator/69542826fa643a0fed2fc9e717f072c2852dc017)
(cherry picked from qtcreator/196424115338fb9a535810704b7d814d318b0462)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 55f915b52f..66364b83a7 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -85,6 +85,8 @@ int runQMake(int argc, char **argv) // This is particularly important for things like QtCreator and scripted builds. setvbuf(stdout, (char *)NULL, _IONBF, 0); + QMakeVfs vfs; + Option::vfs = &vfs; QMakeGlobals globals; Option::globals = &globals; @@ -130,7 +132,7 @@ int runQMake(int argc, char **argv) ProFileCache proFileCache; Option::proFileCache = &proFileCache; - QMakeParser parser(&proFileCache, &Option::evalHandler); + QMakeParser parser(&proFileCache, &vfs, &Option::evalHandler); Option::parser = &parser; QMakeProject project; |