1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: update emsdk to 3.1.14

Browse Source 
This fixes some threading bugs

Change-Id: I1a96dcc54d8338de09b551d52a166d073e85d752
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit 83b75988964b70ec5d947bc38f9cc363232a2be8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lorn Potter 2022-07-05 06:02:06 +10:00 committed by Qt Cherry-pick Bot
parent 9584f999e3
commit a09b9aaba9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPublicWasmToolchainHelpers.cmake
View File

@ -50,7 +50,7 @@ endfunction()
function(__qt_internal_get_emcc_recommended_version out_var) function(__qt_internal_get_emcc_recommended_version out_var)
# This version of Qt needs this version of emscripten. # This version of Qt needs this version of emscripten.
set(QT_EMCC_RECOMMENDED_VERSION "3.1.10") set(QT_EMCC_RECOMMENDED_VERSION "3.1.14")
set(${out_var} "${QT_EMCC_RECOMMENDED_VERSION}" PARENT_SCOPE) set(${out_var} "${QT_EMCC_RECOMMENDED_VERSION}" PARENT_SCOPE)
endfunction() endfunction()

2
mkspecs/features/wasm/emcc_ver.prf
View File

@ -1,5 +1,5 @@
defineReplace(qtEmccRecommendedVersion) { defineReplace(qtEmccRecommendedVersion) {
return (3.1.10) return (3.1.14)
} }
defineReplace(qtSystemEmccVersion) { defineReplace(qtSystemEmccVersion) {