summaryrefslogtreecommitdiffstats
path: root/mkspecs/wasm-emscripten/qmake.conf
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@qt.io>2020-02-13 11:13:18 +0100
committerMorten Johan Sørvig <morten.sorvig@qt.io>2020-04-03 13:32:56 +0200
commitf7722394f457169c90511d73d0ec40588b37850d (patch)
tree95e18a531945b3d1b1c027010dfef4f9e408b330 /mkspecs/wasm-emscripten/qmake.conf
parent4aee10b9da975e91848b7683757358baf3a42792 (diff)
wasm: remove obsolete config
On emsdk 13.9.x WASM_OBJECTS_FILES is always on, and BINARYEN_TRAP_MODE is not needed Change-Id: Id1da1db0278e131f95045bc0902f5cc4c22c1522 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'mkspecs/wasm-emscripten/qmake.conf')
-rw-r--r--mkspecs/wasm-emscripten/qmake.conf14
1 files changed, 0 insertions, 14 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf
index a1b11e93aa..82c02c76e7 100644
--- a/mkspecs/wasm-emscripten/qmake.conf
+++ b/mkspecs/wasm-emscripten/qmake.conf
@@ -8,20 +8,6 @@ include(../common/clang.conf)
load(device_config)
load(emcc_ver)
-# Support setting WASM_OBJECT_FILES with -device-option WASM_OBJECT_FILES=1
-!isEmpty(WASM_OBJECT_FILES): {
- !equals(WASM_OBJECT_FILES, 1):!equals(WASM_OBJECT_FILES, 0): \
- message(Error: The value for WASM_OBJECT_FILES must be 0 or 1)
- QMAKE_CFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
- QMAKE_CXXFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
- QMAKE_LFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
-} else {
- EMSCRIPTEN_VERSION=$$qtSystemEmccVersion()
- lessThan(EMSCRIPTEN_VERSION, 1.39) {
- EMCC_COMMON_LFLAGS += -s \"BINARYEN_TRAP_MODE=\'clamp\'\"
- }
-}
-
EMTERP_FLAGS = \
-s EMTERPRETIFY=1 \
-s EMTERPRETIFY_ASYNC=1 \