diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2013-10-14 08:29:19 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-14 17:44:48 +0200 |
| commit | 9ef84306531f3f146aeff2bed76a859d5a1ba38d (patch) | |
| tree | 8f29da2b15c32ad3774fe50c2441dde12b429d72 | |
| parent | 1502a7f98e18f10851b6429f7977df126237e1a3 (diff) | |
Fix qmake_extras.gypi generation on Windows.
It has a section that tree times appended on Windows because qmake does debug_and_release.
Change-Id: Iba86e578a52846cf0e95e1e7c901879ef5f8ea0b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | build/qmake_extras/host/host.pro | 4 | ||||
| -rw-r--r-- | build/qmake_extras/target/target.pro | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/qmake_extras/host/host.pro b/build/qmake_extras/host/host.pro index 95d7b3cad..e99d1e7c5 100644 --- a/build/qmake_extras/host/host.pro +++ b/build/qmake_extras/host/host.pro @@ -11,4 +11,6 @@ GYPI_CONTENTS = "{" \ " ['LD.host', '$$which($$QMAKE_LINK)']," GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) -write_file($$GYPI_FILE, GYPI_CONTENTS) +!build_pass { + write_file($$GYPI_FILE, GYPI_CONTENTS) +} diff --git a/build/qmake_extras/target/target.pro b/build/qmake_extras/target/target.pro index 294ebc609..39e0b9e32 100644 --- a/build/qmake_extras/target/target.pro +++ b/build/qmake_extras/target/target.pro @@ -12,4 +12,6 @@ GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) !exists($$GYPI_FILE): error("-- $$GYPI not found --") # Append to the file already containing the host settings. -write_file($$GYPI_FILE, GYPI_CONTENTS, append) +!build_pass { + write_file($$GYPI_FILE, GYPI_CONTENTS, append) +} |