diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2022-12-14 11:28:12 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2022-12-28 13:37:01 +0000 |
| commit | 41c10d4db8614bd27322ff570eb4634c11eb404b (patch) | |
| tree | 8746baedd232db40ba2a41b8da6fcfc7a8e7f0c6 | |
| parent | fbf2a318dd3f1e0f9fc8dadb68d47923dff3d672 (diff) | |
wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25. This is not the
most recent version (3.1.27 at the time of writing),
however .26 and .27 make changes to stack layout and size
which require further investigation.
Change-Id: Ibe285ef160d450d6b2c63a7fb71d3561b0032e37
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| -rw-r--r-- | cmake/QtPublicWasmToolchainHelpers.cmake | 2 | ||||
| -rw-r--r-- | mkspecs/features/wasm/emcc_ver.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake index 3ad9424848..798258db94 100644 --- a/cmake/QtPublicWasmToolchainHelpers.cmake +++ b/cmake/QtPublicWasmToolchainHelpers.cmake @@ -53,7 +53,7 @@ endfunction() function(__qt_internal_get_emcc_recommended_version out_var) # This version of Qt needs this version of emscripten. - set(QT_EMCC_RECOMMENDED_VERSION "3.1.14") + set(QT_EMCC_RECOMMENDED_VERSION "3.1.25") set(${out_var} "${QT_EMCC_RECOMMENDED_VERSION}" PARENT_SCOPE) endfunction() diff --git a/mkspecs/features/wasm/emcc_ver.prf b/mkspecs/features/wasm/emcc_ver.prf index 24db969d7f..9d042df34c 100644 --- a/mkspecs/features/wasm/emcc_ver.prf +++ b/mkspecs/features/wasm/emcc_ver.prf @@ -1,5 +1,5 @@ defineReplace(qtEmccRecommendedVersion) { - return (3.1.14) + return (3.1.25) } defineReplace(qtSystemEmccVersion) { |