From fe9c705e9aa0e25760646695820bd876de590893 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 4 Aug 2021 09:44:55 +0200
Subject: [PATCH] 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>
---
 cmake/QtExecutableHelpers.cmake |  2 +-
 src/corelib/Qt6CoreMacros.cmake |  2 +-
 src/corelib/Qt6WasmMacros.cmake | 13 ++-----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index c90eb2150c5..e7dff8522b1 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -34,7 +34,7 @@ function(qt_internal_add_executable name)
     endif()
 
     if(WASM)
-        qt6_wasm_add_target_helpers("${name}")
+        _qt_internal_wasm_add_target_helpers("${name}")
     endif()
     if (arg_VERSION)
         if(arg_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+")
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 882863c5cbe..622505689a9 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 e9c19160a37..2c915b3903a 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()