CMake: Rename internal functions to contain qt_internal

Offer compatibility wrapper functions until we update all of the Qt
repos to use the new names.

Task-number: QTBUG-86815
Change-Id: I5826a4116f52a8509db32601ef7c200f9bd331de
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>

12 files changed, 138 insertions, 78 deletions

diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake
index 1567ca94c6..a593c389f0 100644
--- a/cmake/Qt3rdPartyLibraryHelpers.cmake
+++ b/cmake/Qt3rdPartyLibraryHelpers.cmake
@@ -1,6 +1,6 @@
 # Wrapper function to create a regular cmake target and forward all the
 # arguments collected by the conversion script. This is only meant for tests!
-function(qt_add_cmake_library target)
+function(qt_internal_add_cmake_library target)
     # Process arguments:
     qt_parse_all_arguments(arg "qt_add_cmake_library"
         "SHARED;MODULE;STATIC;INTERFACE"
@@ -58,7 +58,7 @@ function(qt_add_cmake_library target)
         )
     endif()
 
-    qt_extend_target("${target}"
+    qt_internal_extend_target("${target}"
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES
             ${arg_INCLUDE_DIRECTORIES}
@@ -84,7 +84,7 @@ endfunction()
 # This function replaces qmake's qt_helper_lib feature. It is intended to
 # compile 3rdparty libraries as part of the build.
 #
-function(qt_add_3rdparty_library target)
+function(qt_internal_add_3rdparty_library target)
     # Process arguments:
     qt_parse_all_arguments(arg "qt_add_3rdparty_library"
         "SHARED;MODULE;STATIC;INTERFACE;EXCEPTIONS;INSTALL;SKIP_AUTOMOC"
@@ -173,7 +173,7 @@ function(qt_add_3rdparty_library target)
         qt_install(FILES "${pri_file}" DESTINATION "${INSTALL_MKSPECSDIR}/modules")
     endif()
 
-    qt_extend_target("${target}"
+    qt_internal_extend_target("${target}"
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES
             ${arg_INCLUDE_DIRECTORIES}
diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake
index 20edc41b0a..9958b134aa 100644
--- a/cmake/QtAppHelpers.cmake
+++ b/cmake/QtAppHelpers.cmake
@@ -15,7 +15,7 @@ function(qt_internal_add_app target)
         set(no_install NO_INSTALL)
     endif()
 
-    qt_add_executable("${target}"
+    qt_internal_add_executable("${target}"
         DELAY_RC
         DELAY_TARGET_INFO
         OUTPUT_DIRECTORY "${output_directory}"
diff --git a/cmake/QtCompatibilityHelpers.cmake b/cmake/QtCompatibilityHelpers.cmake
index bee2b2cda6..89e23f498f 100644
--- a/cmake/QtCompatibilityHelpers.cmake
+++ b/cmake/QtCompatibilityHelpers.cmake
@@ -1,52 +1,112 @@
-# Compatibility macros that should be removed once all their usages are removed.
-function(extend_target)
-    qt_extend_target(${ARGV})
-endfunction()
-
-function(add_qt_module)
-    qt_add_module(${ARGV})
-endfunction()
-
-function(add_qt_plugin)
-    qt_add_plugin(${ARGV})
-endfunction()
-
-function(add_qt_tool)
-    qt_add_tool(${ARGV})
-endfunction()
-
-function(add_qt_test)
-    qt_add_test(${ARGV})
-endfunction()
-
-function(add_qt_test_helper)
-    qt_add_test_helper(${ARGV})
-endfunction()
-
-function(add_qt_manual_test)
-    qt_add_manual_test(${ARGV})
-endfunction()
-
-function(add_qt_benchmark)
-    qt_add_benchmark(${ARGV})
-endfunction()
-
-function(add_qt_executable)
-    qt_add_executable(${ARGV})
-endfunction()
-
-function(add_qt_simd_part)
-    qt_add_simd_part(${ARGV})
-endfunction()
-
-function(add_qt_docs)
-    qt_add_docs(${ARGV})
-endfunction()
-
-function(add_qt_resource)
-    qt_add_resource(${ARGV})
-endfunction()
-
-function(add_cmake_library)
-    qt_add_cmake_library(${ARGV})
-endfunction()
+if(NOT QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS)
+    # Compatibility functions that should be removed once all their usages are removed.
+    function(extend_target)
+        qt_extend_target(${ARGV})
+    endfunction()
+
+    function(add_qt_module)
+        qt_add_module(${ARGV})
+    endfunction()
+
+    function(add_qt_plugin)
+        qt_add_plugin(${ARGV})
+    endfunction()
+
+    function(add_qt_tool)
+        qt_add_tool(${ARGV})
+    endfunction()
+
+    function(add_qt_test)
+        qt_add_test(${ARGV})
+    endfunction()
+
+    function(add_qt_test_helper)
+        qt_add_test_helper(${ARGV})
+    endfunction()
+
+    function(add_qt_manual_test)
+        qt_add_manual_test(${ARGV})
+    endfunction()
+
+    function(add_qt_benchmark)
+        qt_add_benchmark(${ARGV})
+    endfunction()
+
+    function(add_qt_executable)
+        qt_add_executable(${ARGV})
+    endfunction()
+
+    function(add_qt_simd_part)
+        qt_add_simd_part(${ARGV})
+    endfunction()
+
+    function(add_qt_docs)
+        qt_add_docs(${ARGV})
+    endfunction()
+
+    function(add_qt_resource)
+        qt_add_resource(${ARGV})
+    endfunction()
+
+    function(add_cmake_library)
+        qt_add_cmake_library(${ARGV})
+    endfunction()
+
+
+    # New compatibility functions that should be removed before release.
+    function(qt_extend_target)
+        qt_internal_extend_target(${ARGV})
+    endfunction()
+
+    function(qt_add_module)
+        qt_internal_add_module(${ARGV})
+    endfunction()
+
+    function(qt_add_tool)
+        qt_internal_add_tool(${ARGV})
+    endfunction()
+
+    function(qt_add_test)
+        qt_internal_add_test(${ARGV})
+    endfunction()
+
+    function(qt_add_test_helper)
+        qt_internal_add_test_helper(${ARGV})
+    endfunction()
+
+    function(qt_add_manual_test)
+        qt_internal_add_manual_test(${ARGV})
+    endfunction()
+
+    function(qt_add_benchmark)
+        qt_internal_add_benchmark(${ARGV})
+    endfunction()
+
+    function(qt_add_executable)
+        qt_internal_add_executable(${ARGV})
+    endfunction()
+
+    function(qt_add_simd_part)
+        qt_internal_add_simd_part(${ARGV})
+    endfunction()
+
+    function(qt_add_docs)
+        qt_internal_add_docs(${ARGV})
+    endfunction()
+
+    function(qt_add_resource)
+        qt_internal_add_resource(${ARGV})
+    endfunction()
+
+    function(qt_add_cmake_library)
+        qt_internal_add_cmake_library(${ARGV})
+    endfunction()
+
+    function(qt_add_3rdparty_library)
+        qt_internal_add_3rdparty_library(${ARGV})
+    endfunction()
+
+    function(qt_create_tracepoints)
+        qt_internal_create_tracepoints(${ARGV})
+    endfunction()
+endif()
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
index 4adbfbdfde..8181496b38 100644
--- a/cmake/QtDocsHelpers.cmake
+++ b/cmake/QtDocsHelpers.cmake
@@ -1,4 +1,4 @@
-function(qt_add_docs)
+function(qt_internal_add_docs)
     if(${ARGC} EQUAL 1)
         # Function called from old generated CMakeLists.txt that was missing the target parameter
         return()
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index 3914fe36e6..b34b0b371b 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -1,7 +1,7 @@
 # This function creates a CMake target for a generic console or GUI binary.
 # Please consider to use a more specific version target like the one created
 # by qt_add_test or qt_add_tool below.
-function(qt_add_executable name)
+function(qt_internal_add_executable name)
     qt_parse_all_arguments(arg "qt_add_executable"
         "${__qt_add_executable_optional_args}"
         "${__qt_add_executable_single_args}"
@@ -86,7 +86,7 @@ function(qt_add_executable name)
          ${arg_INCLUDE_DIRECTORIES}
     )
 
-    qt_extend_target("${name}"
+    qt_internal_extend_target("${name}"
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES ${private_includes}
         DEFINES ${arg_DEFINES}
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index 8094be96d3..08f7629cf9 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -8,7 +8,7 @@
 # this module are imported into the scope of the calling feature.
 #
 # Target is without leading "Qt". So e.g. the "QtCore" module has the target "Core".
-function(qt_add_module target)
+function(qt_internal_add_module target)
     qt_internal_module_info(module "${target}")
 
     # Process arguments:
@@ -327,7 +327,7 @@ function(qt_add_module target)
             )
     endif()
 
-    qt_extend_target("${target}"
+    qt_internal_extend_target("${target}"
         ${header_module}
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
index 06399bcc19..73aa6c2fd3 100644
--- a/cmake/QtPluginHelpers.cmake
+++ b/cmake/QtPluginHelpers.cmake
@@ -155,7 +155,7 @@ function(qt_internal_add_plugin target)
         ${arg_PUBLIC_INCLUDE_DIRECTORIES}
     )
 
-    qt_extend_target("${target}"
+    qt_internal_extend_target("${target}"
         SOURCES ${arg_SOURCES}
         INCLUDE_DIRECTORIES
             ${private_includes}
diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake
index 7274186301..d326c7c441 100644
--- a/cmake/QtResourceHelpers.cmake
+++ b/cmake/QtResourceHelpers.cmake
@@ -1,4 +1,4 @@
-function(qt_add_resource target resourceName)
+function(qt_internal_add_resource target resourceName)
     # Don't try to add resources when cross compiling, and the target is actually a host target
     # (like a tool).
     qt_is_imported_target("${target}" is_imported)
diff --git a/cmake/QtSimdHelpers.cmake b/cmake/QtSimdHelpers.cmake
index 26a275dc1f..dbbd4b7da0 100644
--- a/cmake/QtSimdHelpers.cmake
+++ b/cmake/QtSimdHelpers.cmake
@@ -1,7 +1,7 @@
 # Handle files that need special SIMD-related flags.
 # This creates an object library and makes target link
 # to it (privately).
-function(qt_add_simd_part target)
+function(qt_internal_add_simd_part target)
     qt_parse_all_arguments(arg "qt_add_simd_part" "" ""
        "NAME;SIMD;${__default_private_args};COMPILE_FLAGS" ${ARGN})
     if ("x${arg_SIMD}" STREQUAL x)
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
index f14f77d3a4..dd23e8c95b 100644
--- a/cmake/QtTargetHelpers.cmake
+++ b/cmake/QtTargetHelpers.cmake
@@ -1,6 +1,6 @@
 # This function can be used to add sources/libraries/etc. to the specified CMake target
 # if the provided CONDITION evaluates to true.
-function(qt_extend_target target)
+function(qt_internal_extend_target target)
     # Don't try to extend_target when cross compiling an imported host target (like a tool).
     qt_is_imported_target("${target}" is_imported)
     if(is_imported)
@@ -326,7 +326,7 @@ function(qt_internal_export_modern_cmake_config_targets_file)
     qt_install(EXPORT ${export_name} NAMESPACE Qt:: DESTINATION "${__arg_CONFIG_INSTALL_DIR}")
 endfunction()
 
-function(qt_create_tracepoints name tracepoints_file)
+function(qt_internal_create_tracepoints name tracepoints_file)
     string(TOLOWER "${name}" provider_name)
     string(PREPEND provider_name "qt")
     set(header_filename "${provider_name}_tracepoints_p.h")
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
index e9ecf6857a..947436b97d 100644
--- a/cmake/QtTestHelpers.cmake
+++ b/cmake/QtTestHelpers.cmake
@@ -1,7 +1,7 @@
 # Simple wrapper around qt_add_executable for benchmarks which insure that
 # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
 # See qt_add_executable() for more details.
-function(qt_add_benchmark target)
+function(qt_internal_add_benchmark target)
 
     qt_parse_all_arguments(arg "qt_add_benchmark"
         "${__qt_add_executable_optional_args}"
@@ -38,7 +38,7 @@ endfunction()
 # Simple wrapper around qt_add_executable for manual tests which insure that
 # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
 # See qt_add_executable() for more details.
-function(qt_add_manual_test target)
+function(qt_internal_add_manual_test target)
 
     qt_parse_all_arguments(arg "qt_add_manual_test"
         "${__qt_add_executable_optional_args}"
@@ -141,7 +141,7 @@ function(qt_internal_setup_docker_test_fixture name)
 endfunction()
 
 # This function creates a CMake test target with the specified name for use with CTest.
-function(qt_add_test name)
+function(qt_internal_add_test name)
     qt_parse_all_arguments(arg "qt_add_test"
         "RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST;CATCH;LOWDPI"
         "OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT;VERSION"
@@ -173,7 +173,7 @@ function(qt_add_test name)
              ${arg_INCLUDE_DIRECTORIES}
         )
 
-        qt_add_executable("${name}"
+        qt_internal_add_executable("${name}"
             ${exceptions_text}
             ${gui_text}
             ${version_arg}
@@ -205,16 +205,16 @@ function(qt_add_test name)
 
         # QMLTest specifics
 
-        qt_extend_target("${name}" CONDITION arg_QMLTEST
+        qt_internal_extend_target("${name}" CONDITION arg_QMLTEST
             PUBLIC_LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::QuickTest
         )
 
-        qt_extend_target("${name}" CONDITION arg_QMLTEST AND NOT ANDROID
+        qt_internal_extend_target("${name}" CONDITION arg_QMLTEST AND NOT ANDROID
             DEFINES
                 QUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
         )
 
-        qt_extend_target("${name}" CONDITION arg_QMLTEST AND ANDROID
+        qt_internal_extend_target("${name}" CONDITION arg_QMLTEST AND ANDROID
             DEFINES
                 QUICK_TEST_SOURCE_DIR=":/"
         )
@@ -377,7 +377,7 @@ endfunction()
 # tests launch separate programs to test certain input/output behavior.
 # Specify OVERRIDE_OUTPUT_DIRECTORY if you dont' want to place the helper in the parent directory,
 # in which case you should specify OUTPUT_DIRECTORY "/foo/bar" manually.
-function(qt_add_test_helper name)
+function(qt_internal_add_test_helper name)
 
     set(qt_add_test_helper_optional_args
         "OVERRIDE_OUTPUT_DIRECTORY"
@@ -407,5 +407,5 @@ function(qt_add_test_helper name)
         set(extra_args_to_pass OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..")
     endif()
 
-    qt_add_executable("${name}" NO_INSTALL ${extra_args_to_pass} ${forward_args})
+    qt_internal_add_executable("${name}" NO_INSTALL ${extra_args_to_pass} ${forward_args})
 endfunction()
diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake
index 56dcddb310..d1d8fa8b76 100644
--- a/cmake/QtToolHelpers.cmake
+++ b/cmake/QtToolHelpers.cmake
@@ -7,7 +7,7 @@
 #     qt_get_tool_target_name(target_name my_tool)
 #     qt_add_tool(${target_name})
 #
-function(qt_add_tool target_name)
+function(qt_internal_add_tool target_name)
     qt_tool_target_to_name(name ${target_name})
     qt_parse_all_arguments(arg "qt_add_tool" "BOOTSTRAP;NO_QT;NO_INSTALL"
                                "TOOLS_TARGET;${__default_target_info_args}"
@@ -115,7 +115,7 @@ function(qt_add_tool target_name)
         set(no_qt NO_QT)
     endif()
 
-    qt_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+    qt_internal_add_executable("${target_name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
         ${bootstrap}
         ${no_qt}
         NO_INSTALL