diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
commit | 0441d959ff87431ab432ce0c30bbb857a631742e (patch) | |
tree | 25c6c4293f74e39b9d4cf45b15957f233cffa9c5 /configure.json | |
parent | ae0dd3201bc13b81c62752bb04e42362c78bfe16 (diff) | |
parent | 8c685b765bf4ceba3c4cf8fdd9c9d680f338b7a9 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5dbdc13c6133e5b03e362c5461b4a599d781bd1e
Diffstat (limited to 'configure.json')
-rw-r--r-- | configure.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json index d6568b9a7f..8cffe9fb01 100644 --- a/configure.json +++ b/configure.json @@ -1214,6 +1214,7 @@ }, "compile_examples": { "label": "Compile examples", + "autoDetect": "!config.wasm", "output": [ "privateConfig" ] }, "incredibuild_xge": { |