diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2013-11-19 15:06:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 18:54:41 +0100 |
| commit | e56db54f628d788b73100bf0a3ec22ce91d3a82f (patch) | |
| tree | f31c6ee82f8d0e3aa27328054e01cccc15e9a0cc | |
| parent | e8f3b904205a8863c2fe9b0d1b020b27feb0c834 (diff) | |
Add guards to project files to prevent unnecessarily processing on Windows.
On Windows with default debug_and_release configuration project
files parsed tree times while generating Makefile, Makefile.Debug
and Makefile.Release. Some operation needs only one time processing.
Change-Id: I02d04076cbb70c705916703526444585e83a24ff
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | build/build.pro | 6 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/build/build.pro b/build/build.pro index 4fcd5c546..930452e63 100644 --- a/build/build.pro +++ b/build/build.pro @@ -4,8 +4,10 @@ TEMPLATE = aux -message(Running Gyp...) -!system(python ./gyp_qtwebengine): error("-- running gyp_qtwebengine failed --") +!build_pass { + message(Running Gyp...) + !system(python ./gyp_qtwebengine): error("-- running gyp_qtwebengine failed --") +} ninja.target = invoke_ninja ninja.commands = $$findOrBuildNinja() $$(NINJAFLAGS) -C $$getOutDir()/$$getConfigDir() diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 6ad3e476c..d15b864c9 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -196,7 +196,7 @@ GYP_CONTENTS += " ]," \ GYP_CONTENTS += " ]," \ "}" -write_file($$GYPI_FILE, GYP_CONTENTS) +!build_pass: write_file($$GYPI_FILE, GYP_CONTENTS) # Overwriting the generated gyp file seems like a good reason to re-gyp unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro") |