AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Make qt6_wasm_add_target_helpers an internal function

Browse Source 
This function is called by qt_add_executable.  There is no need to
expose it as public function.

Fixes: QTBUG-95172
Change-Id: I85a1d906ecda42458e226db225e47c1d348a72f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-08-04 09:44:55 +02:00
parent 6518bcc167
commit fe9c705e9a
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtExecutableHelpers.cmake
View File

@ -34,7 +34,7 @@ function(qt_internal_add_executable name)
endif() endif()
if(WASM) if(WASM)
qt6_wasm_add_target_helpers("${name}") _qt_internal_wasm_add_target_helpers("${name}")
endif() endif()
if (arg_VERSION) if (arg_VERSION)
if(arg_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+") if(arg_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+")

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -584,7 +584,7 @@ function(_qt_internal_finalize_executable target)
qt6_android_add_apk_target("${target}") qt6_android_add_apk_target("${target}")
endif() endif()
if(EMSCRIPTEN) if(EMSCRIPTEN)
qt_wasm_add_target_helpers("${target}") _qt_internal_wasm_add_target_helpers("${target}")
endif() endif()
if(IOS) if(IOS)
_qt_internal_finalize_ios_app("${target}") _qt_internal_finalize_ios_app("${target}")

13
src/corelib/Qt6WasmMacros.cmake
View File

@ -1,6 +1,5 @@
# Copy in Qt HTML/JS launch files for apps.
function(qt6_wasm_add_target_helpers target) function(_qt_internal_wasm_add_target_helpers target)
# copy in Qt HTML/JS launch files for apps
get_target_property(targetType "${target}" TYPE) get_target_property(targetType "${target}" TYPE)
if("${targetType}" STREQUAL "EXECUTABLE") if("${targetType}" STREQUAL "EXECUTABLE")
@ -21,11 +20,3 @@ function(qt6_wasm_add_target_helpers target)
endif() endif()
endfunction() endfunction()
if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
function(qt_wasm_add_target_helpers)
if(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
qt6_wasm_add_target_helpers(${ARGV})
endif()
endfunction()
endif()