summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2019-08-26 18:18:34 +1000
committerLorn Potter <lorn.potter@gmail.com>2019-12-11 06:06:45 +1000
commit93d261b9650e3d1eb9347310fe8fc1f18e54e328 (patch)
tree35c5f786541299e7f5e349ea437efa7661cdd6fd /configure.json
parentbf65c277892f6f322fa689c06d81ba9b1d9a8038 (diff)
wasm: enforce emscripten version
This creates a define in the binary, as well as writing emscripten version for qmake. It also enforces app builder to use a certain known version. Task-number: QTBUG-77745 Change-Id: I37691512171635cec66aa3ffa16258081f3f1e1b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index 159fdf12fa..23ef7625a6 100644
--- a/configure.json
+++ b/configure.json
@@ -1453,6 +1453,10 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"type": "error",
"condition": "!features.stl",
"message": "Qt requires a compliant STL library."
+ },
+ {
+ "type": "emccVersion",
+ "condition": "config.wasm"
}
],