From a09b9aaba95b19d1d544d38361619bbe1c601cca Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 5 Jul 2022 06:02:06 +1000 Subject: [PATCH] wasm: update emsdk to 3.1.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes some threading bugs Change-Id: I1a96dcc54d8338de09b551d52a166d073e85d752 Reviewed-by: Aleksandr Reviakin Reviewed-by: Morten Johan Sørvig (cherry picked from commit 83b75988964b70ec5d947bc38f9cc363232a2be8) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicWasmToolchainHelpers.cmake | 2 +- 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 c4d637c94e..ba217834bf 100644 --- a/cmake/QtPublicWasmToolchainHelpers.cmake +++ b/cmake/QtPublicWasmToolchainHelpers.cmake @@ -50,7 +50,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.10") + set(QT_EMCC_RECOMMENDED_VERSION "3.1.14") 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 3b56b17158..24db969d7f 100644 --- a/mkspecs/features/wasm/emcc_ver.prf +++ b/mkspecs/features/wasm/emcc_ver.prf @@ -1,5 +1,5 @@ defineReplace(qtEmccRecommendedVersion) { - return (3.1.10) + return (3.1.14) } defineReplace(qtSystemEmccVersion) {