blob: c64b32a407697e472d6e2e2e1cadad68e2deff4d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 2fe53c4c28f91941ee3b446e88f519feb2edc457 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Fri, 20 Jun 2014 09:09:12 +0200
Subject: [PATCH 2/2] Use ninja supplied by environment variable NINJA_PATH
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
tools/qmake/mkspecs/features/functions.prf | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 4dcd8ed..8725fd2 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -84,16 +84,6 @@ defineReplace(which) {
}
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 = "src/3rdparty/chromium"
-
- out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT")
- win32: out = $$system_path($${out}.exe)
-
- # If we did not find ninja, then we bootstrap it.
- !exists($$out) {
- system("python $$dirname(out)/bootstrap.py")
- }
- return($$out)
+ message(Using ninja from path $$NINJA_PATH)
+ return($$NINJA_PATH)
}
--
1.9.1
|
