diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:15:15 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:15:15 +0200 |
| commit | 02c8fa204f53af27907ef48bc74c500d7a05c3a0 (patch) | |
| tree | 56519f143a72884a47c757d96c411e26c10c8a10 /configure.json | |
| parent | 36e8cf3cdb50c0447695f35c2e63eed139704c13 (diff) | |
| parent | 0a63d5fed6e020e81d3c570d299d1292c33fa284 (diff) | |
Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly
Change-Id: Ie6757dd81b49f4d9e677dbd08f5378d6190187b7
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 4dcff122bd..50ac5986ab 100644 --- a/configure.json +++ b/configure.json @@ -523,11 +523,11 @@ "output": [ "prepareSpec", "prepareOptions", "preparePaths", "reloadSpec" ] }, "machineTuple": { - "condition": "!config.linux || config.android || tests.machineTuple", + "condition": "config.linux && !config.android && tests.machineTuple", "output": [ "machineTuple" ] }, "commit": { - "condition": "features.machineTuple", + "condition": "features.machineTuple || true", "output": [ "commitOptions" ] }, "android-style-assets": { |