From 8bab4c9b03424b6cf22d380ca28009d778c1eac3 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 16 Feb 2021 00:25:14 +0200 Subject: CMake: handle Android features dependencies for modules QMake used to allow retrieving the Android features list for a modules. The dependencies are written to *-android-dependencies.xml files and are read by androiddeployqt. This option was missed at some point along the way of writing CMake port for Qt 6. Change-Id: Ic0b82f024567e640968f97aeff2db1888f2b53a5 Reviewed-by: Joerg Bornemann (cherry picked from commit 09fc4f9525740b8c671c036413153d3419750b99) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtAndroidHelpers.cmake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmake/QtAndroidHelpers.cmake b/cmake/QtAndroidHelpers.cmake index 1add6e883c..49fb0627ef 100644 --- a/cmake/QtAndroidHelpers.cmake +++ b/cmake/QtAndroidHelpers.cmake @@ -65,6 +65,16 @@ define_property(TARGET FULL_DOCS "Qt Module android permission list." ) + +define_property(TARGET + PROPERTY + QT_ANDROID_FEATURES + BRIEF_DOCS + "Qt Module android feature list." + FULL_DOCS + "Qt Module android feature list." +) + # Generate Qt Module -android-dependencies.xml required by the # androiddeploytoolqt to successfully copy all the plugins and other dependent # items into tha APK @@ -80,6 +90,7 @@ function(qt_android_dependencies target) get_target_property(arg_LIB_DEPENDENCY_REPLACEMENTS ${target} QT_ANDROID_LIB_DEPENDENCY_REPLACEMENTS) get_target_property(arg_BUNDLED_FILES ${target} QT_ANDROID_BUNDLED_FILES) get_target_property(arg_PERMISSIONS ${target} QT_ANDROID_PERMISSIONS) + get_target_property(arg_FEATURES ${target} QT_ANDROID_FEATURES) get_target_property(module_plugins ${target} MODULE_PLUGIN_TYPES) if ((NOT module_plugins) @@ -88,6 +99,7 @@ function(qt_android_dependencies target) AND (NOT arg_LIB_DEPENDENCIES) AND (NOT arg_BUNDLED_JAR_DEPENDENCIES) AND (NOT arg_PERMISSIONS) + AND (NOT arg_FEATURES) AND (NOT arg_BUNDLED_FILES)) # None of the values were set, so there's nothing to do return() @@ -194,6 +206,13 @@ function(qt_android_dependencies target) endforeach() endif() + # Android Features + if(arg_FEATURES) + foreach(feature IN LISTS arg_FEATURES) + string(APPEND file_contents "\n") + endforeach() + endif() + string(APPEND file_contents "") string(APPEND file_contents "\n") file(WRITE ${dependency_file} ${file_contents}) -- cgit v1.2.3