diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-09-05 15:37:27 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 16:19:13 +0200 |
commit | be550a2b9dcd13fa9cefecfcccdfa3fc84abe4b4 (patch) | |
tree | 21d8500a7bcc7e5d757b48fbcb8aabfcc016263d /build/qmake/mkspecs/features/functions.prf | |
parent | f2540f3285a8810700e5dc21e768b9fe100cf086 (diff) |
Rename findNinja to findOrBuildNinja and fail early if gyp fails
We should not not use the $$ syntax to collect the output of the gyp
call instead we should just fail with an error in case gyp_qtwebengine
fails.
Change-Id: Ib6218bdfb998100a3717470713ed5bf5f30db339
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'build/qmake/mkspecs/features/functions.prf')
-rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf index 17e54cfe1..9a98852b9 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/build/qmake/mkspecs/features/functions.prf @@ -71,7 +71,7 @@ defineReplace(which) { return($$out) } -defineReplace(findNinja) { +defineReplace(findOrBuildNinja) { !isEmpty(CACHED_NINJA_EXECUTABLE):exists($$CACHED_NINJA_EXECUTABLE): return($$CACHED_NINJA_EXECUTABLE) out = $$which(ninja) # Try to be smart about it if we know where the chromium sources are located |