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

Fix completely wrong init_class and jar_bundle_native values

Browse Source 
This prevented androiddeployqt from properly deploying libraries which
specify init class via the ":" delimiter.

Pick-to: 6.0 6.1
Change-Id: Ib9cfa7edc864d7d540577df22284ceb9714a2511
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
This commit is contained in:
Alex Blasche 2021-02-09 12:46:11 +01:00
parent 6512a7fc64
commit 8cceb04232
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtAndroidHelpers.cmake
View File

@ -135,11 +135,11 @@ function(qt_android_dependencies target)
# Bundled Jar Dependencies # Bundled Jar Dependencies
if(arg_BUNDLED_JAR_DEPENDENCIES) if(arg_BUNDLED_JAR_DEPENDENCIES)
foreach(jar_bundle IN LISTS arg_BUNDLED_JAR_DEPENDENCIES) foreach(jar_bundle IN LISTS arg_BUNDLED_JAR_DEPENDENCIES)
section(${jar_bundle} ":" bundle_file init_calss) section(${jar_bundle} ":" bundle_file init_class)
if (init_class) if (init_class)
set(init_class "initClass=\"${init_class}\"") set(init_class "initClass=\"${init_class}\"")
endif() endif()
file(TO_NATIVE_PATH ${jar_bundle} jar_bundle_native) file(TO_NATIVE_PATH ${bundle_file} jar_bundle_native)
string(APPEND file_contents "<jar bundling=\"1\" file=\"${jar_bundle_native}\" ${init_class} />\n") string(APPEND file_contents "<jar bundling=\"1\" file=\"${jar_bundle_native}\" ${init_class} />\n")
endforeach() endforeach()
endif() endif()