diff options
author | Michal Klocek <michal.klocek@qt.io> | 2016-10-21 16:41:08 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2016-11-30 10:41:50 +0000 |
commit | 15a38cb07539dce2b6f7e9008d79e2b7335d3289 (patch) | |
tree | 8900444e4aff22619864a6ab07eed81ae995dfdd /configure.json | |
parent | f2f20462e146508868d488f9bc370c53e000d2d9 (diff) |
Add support for system based ninja
Adds system-ninja feature, which is enabled if
ninja is found in system path.
Change-Id: Icc58bc252d67a27f80c139349be28f9fd239108a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 63abd1dba..66d568de9 100644 --- a/configure.json +++ b/configure.json @@ -8,6 +8,13 @@ } }, + "tests" : { + "ninja": { + "label": "system ninja", + "type": "detectNinja" + } + }, + "features": { "proprietary-codecs": { "label": "Proprietary Codecs", @@ -19,6 +26,11 @@ "label": "Spellchecker", "purpose": "Enables the use of Chromium's spellchecker", "output": [ "privateFeature" ] + }, + "system-ninja": { + "label": "Using system ninja", + "condition": "tests.ninja", + "output": [ "privateFeature" ] } }, @@ -27,7 +39,8 @@ "section": "Qt WebEngine", "entries": [ "proprietary-codecs", - "spellchecker" + "spellchecker", + "system-ninja" ] } ] |