summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-06-26 18:36:23 +0200
committerZeno Albisser <zeno.albisser@digia.com>2013-06-27 13:42:06 +0200
commitd6a9674f398c8578ce1af8cf07d43e6f030dee0b (patch)
tree7517e37bfc40ed18143a7e969d30220d6d89acad /build
parent2922ecedf8b10d1fa5cdb3c9547423ce49c77c43 (diff)
Rename ninja Makefile target to invoke_ninja.
This avoids the Makefile target colliding with the submodule name. If both have the same name, the target would not be invoked. This is because make would find a file/folder ninja in the build subdirectory, and therefore belives that the dependencies for the target "ninja" are fulfilled. Change-Id: I7ef1974e06d9cd7a6023d0d17170e0bf730c4b87 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'build')
-rw-r--r--build/build.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.pro b/build/build.pro
index cd8384edd..402cc919d 100644
--- a/build/build.pro
+++ b/build/build.pro
@@ -8,7 +8,7 @@ message(Running Gyp...)
GYP_OUTPUT = $$system(./gyp_qtwebengine)
message($$GYP_OUTPUT)
-ninja.target = ninja
+ninja.target = invoke_ninja
ninja.commands = $$findNinja() -C $$getOutDir()/$$getConfigDir()
ninja.depends: qmake
QMAKE_EXTRA_TARGETS += ninja