diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2013-11-20 10:30:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-20 15:07:01 +0100 |
| commit | f56da89e1f8091843c43db278d97750e1ecc405b (patch) | |
| tree | a9589d30684babf032b42c0888ca9db257f187d4 | |
| parent | c502cd17441336c4595f1c9373867dcb0d956c01 (diff) | |
Fix findOrBuildNinja in functions.prf on Windows.
On Windows ninja executable has filename extension.
Also slashes need to be converted to backslashes otherwise nmake
will not execute ninja from makefile.
Change-Id: I89a302860c40de4489231914738578e290476e12
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf index 03e47bbc6..87a547b68 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/build/qmake/mkspecs/features/functions.prf @@ -88,7 +88,8 @@ defineReplace(findOrBuildNinja) { git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium" - out = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja") + win32: out = $$system_path($$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja.exe")) + else: out = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja") # If we still did not find ninja, then we bootstrap it. !exists($$out) { message("bootstrapping ninja...") |