diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-15 01:00:51 +0200 |
| commit | 425d34b70edfea5f1be1c37f83f7919b9e2bd84a (patch) | |
| tree | adb4ffb4383a068d5385e8965aee7b9a1a0026af /mkspecs | |
| parent | 1d496a4a1085e6a3ebaa0448b8d6c4da6f8f50d6 (diff) | |
| parent | 8bd48a1c335b404ebbeb7c09c859e0715e6b5cd4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Icc80dacbca8613f2996be75553ff15d0ad242b7e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/wasm-emscripten/qmake.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index c6c3af3622..992803e055 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -14,6 +14,8 @@ load(device_config) 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 { + EMCC_COMMON_LFLAGS += -s \"BINARYEN_TRAP_MODE=\'clamp\'\" } EMTERP_FLAGS = \ @@ -29,8 +31,7 @@ EMCC_COMMON_LFLAGS = \ -s USE_WEBGL2=1 \ -s NO_EXIT_RUNTIME=0 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ - --bind \ - -s \"BINARYEN_TRAP_MODE=\'clamp\'\" + --bind # The -s arguments can also be used with release builds, # but are here in debug for clarity. |