1 files changed, 37 insertions, 12 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 52bb5ec00..f3c2eb905 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -373,24 +373,49 @@ defineTest(use?) {
     return(false)
 }
 
-defineReplace(findOrBuildNinja) {
-  # If NINJA_PATH env var is set, prefer that.
-  # Fallback to locating our own bootstrapped ninja.
-  out = $(NINJA_PATH)
-  !exists($$out) {
+defineReplace(ninjaPath) {
     src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
-
     out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir))
     win32: out = $${out}.exe
+    return($$out)
+}
+
+defineReplace(buildNinja) {
+   out = $$ninjaPath()
+   # check if it is not already build
+   !exists($$out) {
+       mkpath($$dirname(out))
+       src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
+       ninja_configure =  $$system_quote($$system_path($$absolute_path(ninja/configure.py, $$src_3rd_party_dir)))
+       !system("cd $$system_quote($$system_path($$dirname(out))) && python $$ninja_configure --bootstrap") {
+            error("NINJA build error!")
+       }
+   }
+}
+
+defineReplace(gnPath) {
+    src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
+    out = $$shadowed($$absolute_path(chromium/tools/gn/out/Release/gn, $$src_3rd_party_dir))
+
+    win32: out = $${out}.exe
+    return($$out)
+}
 
-    # If we did not find ninja, then we bootstrap it.
+defineReplace(buildGn) {
+    gn_args = $$1
+    out = $$gnPath()
+    !qtConfig(system-ninja): ninja_path = "--path $$ninjaPath()"
+    # check if it is not already build
     !exists($$out) {
-      mkpath($$dirname(out))
-      ninja_configure = $$absolute_path(ninja/configure.py, $$src_3rd_party_dir)
-      system("cd $$system_quote($$system_path($$dirname(out))) && python $$system_quote($$system_path($$ninja_configure)) --bootstrap")
+        mkpath($$dirname(out))
+        src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
+        gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir))
+        gn_args = $$system_quote($$gn_args)
+        gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path
+        !system("cd $$system_quote($$system_path($$dirname(out))) && python $$gn_configure") {
+            error("GN build error!")
+        }
     }
-  }
-  return($$system_path($$out))
 }
 
 defineTest(skipBuild) {