diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-08 18:58:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-12 13:35:55 +0200 |
| commit | e57ccd45cad98bd92638937de1218c5a7b9f7baa (patch) | |
| tree | dd94b03d864928de277da74d112713bcd6e5b40d /cmake | |
| parent | 1e1805ed36a932dcb085a1ad3308782a136d477c (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
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}) |