1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update internal function signatures

Browse Source 
Update _qt_internal_add_android_deployment_multi_value_property and
_qt_internal_add_android_deployment_property signatures to match the
_qt_internal_add_android_deployment_list_property signature.

Pick-to: 6.3
Change-Id: Ie4fb2ebe96c783222fc4b56c3186e22b96cbbb95
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2021-12-27 18:07:38 +01:00
parent 585f46c811
commit 2cb50b9fef
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/corelib/Qt6AndroidMacros.cmake
View File

@ -170,36 +170,36 @@ function(qt6_android_generate_deployment_settings target)
" \"architectures\": { ${architecture_records} },\n") " \"architectures\": { ${architecture_records} },\n")
# deployment dependencies # deployment dependencies
_qt_internal_add_android_deployment_multi_value_property(file_contents ${target} _qt_internal_add_android_deployment_multi_value_property(file_contents "dependencies"
"QT_ANDROID_DEPLOYMENT_DEPENDENCIES" "dependencies") ${target} "QT_ANDROID_DEPLOYMENT_DEPENDENCIES" )
# Extra plugins # Extra plugins
_qt_internal_add_android_deployment_multi_value_property(file_contents ${target} _qt_internal_add_android_deployment_multi_value_property(file_contents "android-extra-plugins"
"QT_ANDROID_EXTRA_PLUGINS" "android-extra-plugins") ${target} "QT_ANDROID_EXTRA_PLUGINS" )
# Extra libs # Extra libs
_qt_internal_add_android_deployment_multi_value_property(file_contents ${target} _qt_internal_add_android_deployment_multi_value_property(file_contents "android-extra-libs"
"QT_ANDROID_EXTRA_LIBS" "android-extra-libs") ${target} "QT_ANDROID_EXTRA_LIBS" )
# package source dir # package source dir
_qt_internal_add_android_deployment_property(file_contents ${target} _qt_internal_add_android_deployment_property(file_contents "android-package-source-directory"
"_qt_android_native_package_source_dir" "android-package-source-directory") ${target} "_qt_android_native_package_source_dir")
# version code # version code
_qt_internal_add_android_deployment_property(file_contents ${target} _qt_internal_add_android_deployment_property(file_contents "android-version-code"
"QT_ANDROID_VERSION_CODE" "android-version-code") ${target} "QT_ANDROID_VERSION_CODE")
# version name # version name
_qt_internal_add_android_deployment_property(file_contents ${target} _qt_internal_add_android_deployment_property(file_contents "android-version-name"
"QT_ANDROID_VERSION_NAME" "android-version-name") ${target} "QT_ANDROID_VERSION_NAME")
# minimum SDK version # minimum SDK version
_qt_internal_add_android_deployment_property(file_contents ${target} _qt_internal_add_android_deployment_property(file_contents "android-min-sdk-version"
"QT_ANDROID_MIN_SDK_VERSION" "android-min-sdk-version") ${target} "QT_ANDROID_MIN_SDK_VERSION")
# target SDK version # target SDK version
_qt_internal_add_android_deployment_property(file_contents ${target} _qt_internal_add_android_deployment_property(file_contents "android-target-sdk-version"
"QT_ANDROID_TARGET_SDK_VERSION" "android-target-sdk-version") ${target} "QT_ANDROID_TARGET_SDK_VERSION")
# QML import paths # QML import paths
if(NOT "${QT_QML_OUTPUT_DIRECTORY}" STREQUAL "") if(NOT "${QT_QML_OUTPUT_DIRECTORY}" STREQUAL "")
@ -211,8 +211,8 @@ function(qt6_android_generate_deployment_settings target)
set_property(TARGET "${target}" PROPERTY set_property(TARGET "${target}" PROPERTY
"_qt_native_qml_import_paths" "${native_qml_import_paths}") "_qt_native_qml_import_paths" "${native_qml_import_paths}")
endif() endif()
_qt_internal_add_android_deployment_multi_value_property(file_contents ${target} _qt_internal_add_android_deployment_multi_value_property(file_contents "qml-import-paths"
"_qt_native_qml_import_paths" "qml-import-paths") ${target} "_qt_native_qml_import_paths")
# QML root paths # QML root paths
file(TO_CMAKE_PATH "${target_source_dir}" native_target_source_dir) file(TO_CMAKE_PATH "${target_source_dir}" native_target_source_dir)
@ -652,7 +652,7 @@ endfunction()
# The function converts the target property to a json record and appends it to the output # The function converts the target property to a json record and appends it to the output
# variable. # variable.
function(_qt_internal_add_android_deployment_property out_var target property json_key) function(_qt_internal_add_android_deployment_property out_var json_key target property)
set(property_genex "$<TARGET_PROPERTY:${target},${property}>") set(property_genex "$<TARGET_PROPERTY:${target},${property}>")
string(APPEND ${out_var} string(APPEND ${out_var}
"$<$<BOOL:${property_genex}>:" "$<$<BOOL:${property_genex}>:"
@ -723,7 +723,7 @@ endfunction()
# The generated JSON object is a simple string with the list property items separated by commas, # The generated JSON object is a simple string with the list property items separated by commas,
# e.g: # e.g:
# "android-extra-plugins": "plugin1,plugin2", # "android-extra-plugins": "plugin1,plugin2",
function(_qt_internal_add_android_deployment_multi_value_property out_var target property json_key) function(_qt_internal_add_android_deployment_multi_value_property out_var json_key target property)
set(property_genex set(property_genex
"$<TARGET_PROPERTY:${target},${property}>" "$<TARGET_PROPERTY:${target},${property}>"
) )