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

wasm: partial revert of 06b95cf55e33ca153a149a1685f6b7a16c4a02fa

Browse Source 
Remove the batch test code as it is not in 6.4 branch

and fix

Change-Id: Ie0a26f1728d1686a8ccfb45e828d279711833324
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2022-09-07 17:39:26 +10:00
parent 1a65c64b59
commit a57cc71ee1
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/corelib/Qt6WasmMacros.cmake
View File

@ -12,7 +12,7 @@ function(_qt_internal_wasm_add_target_helpers target)
endif() endif()
get_target_property(output_name ${target} OUTPUT_NAME) get_target_property(output_name ${target} OUTPUT_NAME)
if(NOT "${output_name}" STREQUAL "") if(output_name)
set(_target_output_name "${output_name}") set(_target_output_name "${output_name}")
else() else()
set(_target_output_name "${target}") set(_target_output_name "${target}")
@ -20,33 +20,21 @@ function(_qt_internal_wasm_add_target_helpers target)
set(APPNAME ${_target_output_name}) set(APPNAME ${_target_output_name})
_qt_internal_test_batch_target_name(test_batch_target_name)
get_target_property(target_output_directory ${target} RUNTIME_OUTPUT_DIRECTORY) get_target_property(target_output_directory ${target} RUNTIME_OUTPUT_DIRECTORY)
if(QT_BUILD_TESTS_BATCHED AND target STREQUAL test_batch_target_name) if(target_output_directory)
configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.html" set(_target_directory "${target_output_directory}")
"${target_output_directory}/batchedtestrunner.html" COPYONLY)
configure_file("${WASM_BUILD_DIR}/libexec/batchedtestrunner.js"
"${target_output_directory}/batchedtestrunner.js" COPYONLY)
configure_file("${WASM_BUILD_DIR}/libexec/qwasmjsruntime.js"
"${target_output_directory}/qwasmjsruntime.js" COPYONLY)
configure_file("${WASM_BUILD_DIR}/libexec/util.js"
"${target_output_directory}/util.js" COPYONLY)
else() else()
if(NOT "${target_output_directory}" STREQUAL "") set(_target_directory "${CMAKE_CURRENT_BINARY_DIR}")
set(_target_directory "${target_output_directory}")
else()
set(_target_directory "${CMAKE_CURRENT_BINARY_DIR}")
endif()
configure_file("${WASM_BUILD_DIR}/plugins/platforms/wasm_shell.html"
"${_target_directory}/${_target_output_name}.html")
configure_file("${WASM_BUILD_DIR}/plugins/platforms/qtloader.js"
${_target_directory}/qtloader.js COPYONLY)
configure_file("${WASM_BUILD_DIR}/plugins/platforms/qtlogo.svg"
${_target_directory}/qtlogo.svg COPYONLY)
endif() endif()
configure_file("${WASM_BUILD_DIR}/plugins/platforms/wasm_shell.html"
"${_target_directory}/${_target_output_name}.html")
configure_file("${WASM_BUILD_DIR}/plugins/platforms/qtloader.js"
${_target_directory}/qtloader.js COPYONLY)
configure_file("${WASM_BUILD_DIR}/plugins/platforms/qtlogo.svg"
${_target_directory}/qtlogo.svg COPYONLY)
if(QT_FEATURE_thread) if(QT_FEATURE_thread)
set(POOL_SIZE 4) set(POOL_SIZE 4)
get_target_property(_tmp_poolSize "${target}" QT_WASM_PTHREAD_POOL_SIZE) get_target_property(_tmp_poolSize "${target}" QT_WASM_PTHREAD_POOL_SIZE)