From e57ccd45cad98bd92638937de1218c5a7b9f7baa Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 8 Oct 2020 18:58:03 +0200
Subject: CMake: Rename some additional functions that should be internal

Amends e0c62a48b8a826a46a143e57e94b2a0ea73c7cae

Task-number: QTBUG-86815
Change-Id: Ic65d8dda1aed390c78408616fb22f38edd2e1dce
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 cmake/QtPlatformAndroid.cmake | 2 +-
 cmake/QtTestHelpers.cmake     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmake')

diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
index 20978c33ba..a038fdfb98 100644
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@@ -126,7 +126,7 @@ define_property(TARGET
 )
 
 # Add a test for Android which will be run by the android test runner tool
-function(qt_android_add_test target)
+function(qt_internal_android_add_test target)
     set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt")
     set(test_runner "${QT_HOST_PATH}/bin/androidtestrunner")
 
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
index 6964ad582c..0dca2ab6ab 100644
--- a/cmake/QtTestHelpers.cmake
+++ b/cmake/QtTestHelpers.cmake
@@ -237,7 +237,7 @@ function(qt_internal_add_test name)
     endif()
 
     if (ANDROID)
-        qt_android_add_test("${name}")
+        qt_internal_android_add_test("${name}")
     else()
         if(arg_QMLTEST AND NOT arg_SOURCES)
             set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -343,7 +343,7 @@ function(qt_internal_add_test name)
             endforeach()
 
             if (builtin_files)
-                qt_add_resource(${name} "${name}_testdata_builtin"
+                qt_internal_add_resource(${name} "${name}_testdata_builtin"
                     PREFIX "/"
                     FILES ${builtin_files}
                     BASE ${CMAKE_CURRENT_SOURCE_DIR})
-- 
cgit v1.2.3