summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@qt.io>2018-10-03 14:14:23 +0200
committerLiang Qi <liang.qi@qt.io>2018-11-11 09:10:17 +0000
commite72613000edc46f3f2b354a698202ac0a4a32fb3 (patch)
treeca0ad78e6bcf04956a26d280bcf0b65525a46253
parent98c789eb0fb36493254d60cddce4a1eaa6a1665b (diff)
wasm: skip examples by default
This removes the need for specifying "-nomake examples" on the configure line. We are using static builds; building all of the examples is too space and time consuming (especially time). Change-Id: Iff23239ca7304b1d1cf734c8bf69ad3f8ef31844 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r--config_help.txt3
-rw-r--r--configure.json1
2 files changed, 3 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt
index 5b32eb183f..44dccfb8da 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -213,7 +213,8 @@ Component selection:
[libs and examples, also tools if not cross-building,
also tests if -developer-build]
-nomake <part> ....... Exclude <part> from the list of parts to be built.
- -compile-examples .... When unset, install only the sources of examples [yes]
+ -compile-examples .... When unset, install only the sources of examples
+ [no on WebAssembly, otherwise yes]
-gui ................. Build the Qt GUI module and dependencies [yes]
-widgets ............. Build the Qt Widgets module and dependencies [yes]
-no-dbus ............. Do not build the Qt D-Bus module
diff --git a/configure.json b/configure.json
index 522bd34e9b..7c79b5c582 100644
--- a/configure.json
+++ b/configure.json
@@ -1203,6 +1203,7 @@
},
"compile_examples": {
"label": "Compile examples",
+ "autoDetect": "!config.wasm",
"output": [ "privateConfig" ]
},
"incredibuild_xge": {