Merge 5.9 into 5.9.0v5.9.0-beta4

Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15

1 files changed, 15 insertions, 21 deletions

diff --git a/src/buildtools/ninja.pro b/src/buildtools/ninja.pro
index c391d6e84..1b17c6dfa 100644
--- a/src/buildtools/ninja.pro
+++ b/src/buildtools/ninja.pro
@@ -1,31 +1,25 @@
 TEMPLATE = aux
-CONFIG += release
 
-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!")
-       }
-   }
-}
+!debug_and_release: CONFIG += release
 
 isQtMinimum(5, 8) {
     include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
     QT_FOR_CONFIG += webengine-private
 }
 
-!qtConfig(system-ninja) {
-    buildninja.target = build_ninja
-    buildninja.commands = $$buildNinja()
-    QMAKE_EXTRA_TARGETS += buildninja
-
-    default_target.target = first
-    default_target.depends = buildninja
-    QMAKE_EXTRA_TARGETS += default_target
+build_pass|!debug_and_release {
+    !qtConfig(system-ninja): CONFIG(release, debug|release) {
+        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))) && $$pythonPathForSystem() $$ninja_configure --bootstrap") {
+                error("NINJA build error!")
+            }
+        }
+    QMAKE_DISTCLEAN += $$out
+    }
 }