diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2025-07-15 11:56:16 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2025-07-17 13:57:57 +0200 |
| commit | a85ae7094b219cd1d79db09e2fa4cbe4333cf39f (patch) | |
| tree | 1b3a350064f6bf15d292c3fbc2fc23104586e0e6 /cmake/QtAndroidHelpers.cmake | |
| parent | 415967b7fa77c038983efe3e0adc08cbba8a0153 (diff) | |
Fix permission handling for internal modules
Update the code that generates <module>-android-dependencies.xml.
Use the correct qt_internal_add_android_permission instead of
setting permissions property manually.
Amends f430c5ae81238b47939fca610f5d22ab030a4852
Change-Id: Icc46a54f6915bc344afe5507b3244225d750cb7c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtAndroidHelpers.cmake')
| -rw-r--r-- | cmake/QtAndroidHelpers.cmake | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/cmake/QtAndroidHelpers.cmake b/cmake/QtAndroidHelpers.cmake index cb7d4716f12..b473c2c331b 100644 --- a/cmake/QtAndroidHelpers.cmake +++ b/cmake/QtAndroidHelpers.cmake @@ -191,21 +191,8 @@ function(qt_internal_android_dependencies_content target file_content_out) endif() # Android Permissions - if(arg_PERMISSIONS) - foreach(permission IN LISTS arg_PERMISSIONS) - # Check if the permission has also extra attributes in addition to the permission name - list(LENGTH permission permission_len) - if(permission_len EQUAL 1) - string(APPEND file_contents "<permission name=\"${permission}\" />\n") - elseif(permission_len EQUAL 2) - list(GET permission 0 name) - list(GET permission 1 extras) - string(APPEND file_contents "<permission name=\"${name}\" extras=\"${extras}\"/>\n") - else() - message(FATAL_ERROR "Invalid permission format: ${permission} ${permission_len}") - endif() - endforeach() - endif() + _qt_internal_android_convert_permissions(permissions_string ${target} "DEPENDENCIESXML") + string(APPEND file_contents "${permissions_string}") # Android Features if(arg_FEATURES) @@ -482,14 +469,8 @@ function(qt_internal_android_add_interface_permissions target) return() endif() - set(postprocessed_permissions "") - foreach(permission IN LISTS permissions) - # TODO: skip processing extras for now, add them back once internal API - # will cover adding extras using internal function. - list(APPEND postprocessed_permissions "name\;${permission}") - endforeach() qt_internal_set_module_transitive_properties(${target} TYPE LINK PROPERTIES - INTERFACE_QT_ANDROID_PERMISSIONS "${postprocessed_permissions}") + INTERFACE_QT_ANDROID_PERMISSIONS "${permissions}") endfunction() # The function stores Android features that are required by the module target. |