From f16c7b1947d060a2ae14c4409d44e6f31c469934 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 20 Mar 2018 14:27:17 +0100
Subject: [PATCH] Pass silent on to ninja
If NINJAFLAGS is not explicitly set, set its verbosity based on
Qt's configuration.
Change-Id: I49ef48f6bfa5461dcccba05709c74df6834e2e3a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/gn_run.pro | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index dbf859100..384eaca37 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -50,7 +50,10 @@ build_pass|!debug_and_release {
error("GN run error!")
}
- runninja.commands = $$NINJA \$\(NINJAFLAGS\) -C $$gn_build_root QtWebEngineCore
+ ninjaflags = $$(NINJAFLAGS)
+ isEmpty(ninjaflags):!silent: ninjaflags = "-v"
+
+ runninja.commands = $$NINJA $$ninjaflags -C $$gn_build_root QtWebEngineCore
QMAKE_EXTRA_TARGETS += runninja
build_pass:build_all: default_target.target = all
--
GitLab