diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-09 16:13:37 +0100 |
| commit | 04b30d974aee4fc556249b1bfa62c7cb79b839c5 (patch) | |
| tree | 8c287e09e01936c0f482522d5082bbf64bafb786 /tools | |
| parent | 1c09b16ebb88737682a5cd6ddc58f6d360b635af (diff) | |
| parent | 7c5f2a9393a3fc77c0c5b2406332d57a37325183 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 2c75f4984..2447d8372 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -180,8 +180,12 @@ defineReplace(findOrBuildNinja) { log("Build directory is different from source directory - copying ninja sources to the build tree...") shadow_3rd_party_path = $$system_path($$shadowed($$src_3rd_party_dir)) - !exists($$dirname(out)): mkpath($$shadow_3rd_party_path) - system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$shadow_3rd_party_path)") + !exists($$dirname(out)): mkpath($$dirname(out)) + copy_dir_files { + system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$dirname(out))") + } else { + system("$$QMAKE_COPY_DIR $$system_quote($$system_path($$absolute_path("ninja", "$$src_3rd_party_dir"))) $$system_quote($$shadow_3rd_party_path)") + } } system("cd $$system_quote($$dirname(out)) && python configure.py --bootstrap") } |