summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-08-04 09:44:55 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-08-04 17:01:11 +0200
commitfe9c705e9aa0e25760646695820bd876de590893 (patch)
tree8c7504b44da2a2424694d10587ae24c8d193c76d /src
parent6518bcc167d47e1c27d082c21551b9a838b04e5d (diff)
CMake: Make qt6_wasm_add_target_helpers an internal function
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>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/Qt6CoreMacros.cmake2
-rw-r--r--src/corelib/Qt6WasmMacros.cmake13
2 files changed, 3 insertions, 12 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 882863c5cb..622505689a 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -584,7 +584,7 @@ function(_qt_internal_finalize_executable target)
qt6_android_add_apk_target("${target}")
endif()
if(EMSCRIPTEN)
- qt_wasm_add_target_helpers("${target}")
+ _qt_internal_wasm_add_target_helpers("${target}")
endif()
if(IOS)
_qt_internal_finalize_ios_app("${target}")
diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake
index e9c19160a3..2c915b3903 100644
--- a/src/corelib/Qt6WasmMacros.cmake
+++ b/src/corelib/Qt6WasmMacros.cmake
@@ -1,6 +1,5 @@
-
-function(qt6_wasm_add_target_helpers target)
- # copy in Qt HTML/JS launch files for apps
+# Copy in Qt HTML/JS launch files for apps.
+function(_qt_internal_wasm_add_target_helpers target)
get_target_property(targetType "${target}" TYPE)
if("${targetType}" STREQUAL "EXECUTABLE")
@@ -21,11 +20,3 @@ function(qt6_wasm_add_target_helpers target)
endif()
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()