diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-11 01:00:13 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-04-11 14:59:13 +0200 |
| commit | 58a42898006f221807a08557f588a2d973a7ada2 (patch) | |
| tree | 62d92617eae5df5aae666ea0902159498b285b24 /mkspecs | |
| parent | 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (diff) | |
| parent | 1ec350e35fcea87c527b36cf429b595731059240 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
Change-Id: I22daf269a8f28f80630b5f521b91637531156404
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/wasm-emscripten/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index 18562621ac..a1880b4c22 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -37,7 +37,7 @@ EMCC_COMMON_LFLAGS += \ -s FULL_ES2=1 \ -s FULL_ES3=1 \ -s USE_WEBGL2=1 \ - -s NO_EXIT_RUNTIME=0 \ + -s EXIT_RUNTIME=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ -s EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF16ToString\",\"stringToUTF16\"] \ --bind \ |