summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2021-11-15 17:41:05 +1000
committerLorn Potter <lorn.potter@gmail.com>2021-12-09 03:22:36 +1000
commit3bbbd4ae121f9be8c959a42872875eb07b939d43 (patch)
treec91648547b52db0ed6e95ae6b0ec50131bb57c24
parent1f2f61d80860f55638cfd194bbed5d679a588b1f (diff)
wasm: update recommended emscripten to 3.0.0
[ChangeLog][wasm] Recommended emscripten version is now 3.0.0 Change-Id: I9ae082509415d8f00b8e9970b730ad4a472da310 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r--cmake/QtPublicWasmToolchainHelpers.cmake2
-rw-r--r--mkspecs/features/wasm/emcc_ver.prf2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtPublicWasmToolchainHelpers.cmake b/cmake/QtPublicWasmToolchainHelpers.cmake
index 8d0d9efdc9..0aa5d0145f 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 "2.0.14")
+ set(QT_EMCC_RECOMMENDED_VERSION "3.0.0")
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 3605651494..88a75108f1 100644
--- a/mkspecs/features/wasm/emcc_ver.prf
+++ b/mkspecs/features/wasm/emcc_ver.prf
@@ -1,5 +1,5 @@
defineReplace(qtEmccRecommendedVersion) {
- return (1.39.8)
+ return (3.0.0)
}
defineReplace(qtSystemEmccVersion) {