3 files changed, 26 insertions, 9 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 3f02661e18..aa9ac9104a 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -13,11 +13,16 @@ function(qt6_android_get_sdk_build_tools_revision out_var)
         list(SORT android_build_tools)
         list(REVERSE android_build_tools)
         list(GET android_build_tools 0 android_build_tools_latest)
-        set(QT_ANDROID_SDK_BUILD_TOOLS_REVISION ${android_build_tools_latest})
     endif()
-    set(${out_var} "${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}" PARENT_SCOPE)
+    set(${out_var} "${android_build_tools_latest}" PARENT_SCOPE)
 endfunction()
 
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_android_get_sdk_build_tools_revision)
+        qt6_android_get_sdk_build_tools_revision(${ARGV})
+    endfunction()
+endif()
+
 # Generate the deployment settings json file for a cmake target.
 function(qt6_android_generate_deployment_settings target)
     # Information extracted from mkspecs/features/android/android_deployment_settings.prf
diff --git a/src/corelib/Qt6CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake
index d1ea0a350d..ccfa4c5c99 100644
--- a/src/corelib/Qt6CTestMacros.cmake
+++ b/src/corelib/Qt6CTestMacros.cmake
@@ -112,7 +112,7 @@ function(_qt_internal_set_up_test_run_environment testname)
 
 endfunction()
 
-macro(expect_pass _dir)
+macro(_qt_internal_test_expect_pass _dir)
   cmake_parse_arguments(_ARGS "" "BINARY" "" ${ARGN})
   string(REPLACE "(" "_" testname "${_dir}")
   string(REPLACE ")" "_" testname "${testname}")
@@ -136,7 +136,7 @@ macro(expect_pass _dir)
   endif()
 endmacro()
 
-macro(expect_fail _dir)
+macro(_qt_internal_test_expect_fail _dir)
   string(REPLACE "(" "_" testname "${_dir}")
   string(REPLACE ")" "_" testname "${testname}")
   file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}")
@@ -172,7 +172,7 @@ macro(expect_fail _dir)
   )
 endmacro()
 
-function(test_module_includes)
+function(_qt_internal_test_module_includes)
 
   set(all_args ${ARGN})
   set(packages_string "")
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 4179b7fbe7..413f14c754 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -308,7 +308,7 @@ endif()
 function(qt6_add_resources outfiles )
     if (TARGET ${outfiles})
         cmake_parse_arguments(arg "" "OUTPUT_TARGETS" "" ${ARGN})
-        qt6_process_resource(${ARGV})
+        _qt_internal_process_resource(${ARGV})
         if (arg_OUTPUT_TARGETS)
             set(${arg_OUTPUT_TARGETS} ${${arg_OUTPUT_TARGETS}} PARENT_SCOPE)
         endif()
@@ -1031,6 +1031,12 @@ END
     endif()
 endfunction()
 
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_generate_win32_rc_file)
+        qt6_generate_win32_rc_file(${ARGV})
+    endfunction()
+endif()
+
 function(__qt_get_relative_resource_path_for_file output_alias file)
     get_property(alias SOURCE ${file} PROPERTY QT_RESOURCE_ALIAS)
     if (NOT alias)
@@ -1073,7 +1079,7 @@ endfunction()
 # will be generated. Should you wish to perform additional processing on these
 # targets pass a value to the OUTPUT_TARGETS parameter.
 #
-function(QT6_PROCESS_RESOURCE target resourceName)
+function(_qt_internal_process_resource target resourceName)
 
     cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE;OUTPUT_TARGETS" "FILES;OPTIONS" ${ARGN})
 
@@ -1103,7 +1109,7 @@ function(QT6_PROCESS_RESOURCE target resourceName)
     if(NOT rcc_PREFIX)
         get_target_property(rcc_PREFIX ${target} QT_RESOURCE_PREFIX)
         if (NOT rcc_PREFIX)
-            message(FATAL_ERROR "QT6_PROCESS_RESOURCE() was called without a PREFIX and the target does not provide QT_RESOURCE_PREFIX. Please either add a PREFIX or make the target ${target} provide a default.")
+            message(FATAL_ERROR "_qt_internal_process_resource() was called without a PREFIX and the target does not provide QT_RESOURCE_PREFIX. Please either add a PREFIX or make the target ${target} provide a default.")
         endif()
     endif()
 
@@ -1286,10 +1292,16 @@ endif()
 # By default Qt6 forces usage of utf8 sources for consumers of Qt.
 # Users can opt out of utf8 sources by calling this function with the target name of their
 # application or library.
-function(qt_disable_utf8_sources target)
+function(qt6_disable_utf8_sources target)
     set_target_properties("${target}" PROPERTIES QT_NO_UTF8_SOURCE TRUE)
 endfunction()
 
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_disable_utf8_sources)
+        qt6_disable_utf8_sources(${ARGV})
+    endfunction()
+endif()
+
 function(_qt_internal_apply_strict_cpp target)
     # Disable C, Obj-C and C++ GNU extensions aka no "-std=gnu++11".
     # Similar to mkspecs/features/default_post.prf's CONFIG += strict_cpp.