diff options
| -rw-r--r-- | cmake/QtWasmHelpers.cmake | 6 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index a0e9e4a78b..203cd03c46 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -42,10 +42,12 @@ function (qt_internal_setup_wasm_target_properties wasmTarget) target_compile_options("${wasmTarget}" INTERFACE "SHELL:-s USE_PTHREADS=1") target_link_options("${wasmTarget}" INTERFACE "SHELL:-s USE_PTHREADS=1") + set(POOL_SIZE 4) if(DEFINED QT_WASM_PTHREAD_POOL_SIZE) - target_link_options("${wasmTarget}" INTERFACE "SHELL:-s PTHREAD_POOL_SIZE=${QT_WASM_PTHREAD_POOL_SIZE}") - message("Setting PTHREAD_POOL_SIZE to ${QT_WASM_PTHREAD_POOL_SIZE}") + set(POOL_SIZE ${QT_WASM_PTHREAD_POOL_SIZE}) endif() + target_link_options("${wasmTarget}" INTERFACE "SHELL:-s PTHREAD_POOL_SIZE=${POOL_SIZE}") + message("Setting PTHREAD_POOL_SIZE to ${POOL_SIZE}") else() target_link_options("${wasmTarget}" INTERFACE "SHELL:-s ALLOW_MEMORY_GROWTH=1") diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 596f521ffa..b1e6401b0f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1074,7 +1074,9 @@ public: case TestFunctionStart: case TestFunctionEnd: if (Q_UNLIKELY(!waitFor(locker, e))) { +#ifndef Q_OS_WASM stackTrace(); +#endif qFatal("Test function timed out"); } } |