meta-qt5/recipes-qt/qt5/qtwebengine/0001-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch

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