qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Rename some additional functions that should be internal 

Amends e0c62a48b8

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>
This commit is contained in:
Alexandru Croitor 2020-10-08 18:58:03 +02:00
parent 1e1805ed36
commit e57ccd45ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPlatformAndroid.cmake
View File

@ -126,7 +126,7 @@ define_property(TARGET
) )
# Add a test for Android which will be run by the android test runner tool # 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(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt")
set(test_runner "${QT_HOST_PATH}/bin/androidtestrunner") set(test_runner "${QT_HOST_PATH}/bin/androidtestrunner")

4
cmake/QtTestHelpers.cmake
View File

@ -237,7 +237,7 @@ function(qt_internal_add_test name)
endif() endif()
if (ANDROID) if (ANDROID)
qt_android_add_test("${name}") qt_internal_android_add_test("${name}")
else() else()
if(arg_QMLTEST AND NOT arg_SOURCES) if(arg_QMLTEST AND NOT arg_SOURCES)
set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}") set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
@ -343,7 +343,7 @@ function(qt_internal_add_test name)
endforeach() endforeach()
if (builtin_files) if (builtin_files)
qt_add_resource(${name} "${name}_testdata_builtin" qt_internal_add_resource(${name} "${name}_testdata_builtin"
PREFIX "/" PREFIX "/"
FILES ${builtin_files} FILES ${builtin_files}
BASE ${CMAKE_CURRENT_SOURCE_DIR}) BASE ${CMAKE_CURRENT_SOURCE_DIR})