summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-03-20 14:27:17 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-03-20 21:57:54 +0000
commitf16c7b1947d060a2ae14c4409d44e6f31c469934 (patch)
treed3cee3fef978cbbf7b45d8fc01e6bcf173401bfc
parentb3a22b1bd8ddbb7de7cd58bc8f2dea933aea3652 (diff)
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>
-rw-r--r--src/core/gn_run.pro5
1 files changed, 4 insertions, 1 deletions
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