Fix completely wrong init_class and jar_bundle_native values
This prevented androiddeployqt from properly deploying libraries which specify init class via the ":" delimiter. Change-Id: Ib9cfa7edc864d7d540577df22284ceb9714a2511 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> (cherry picked from commit 8cceb04232001e51276f1588d9e67f2c696fbe91) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
dca5a2ca39
commit
f8d209c0da
@ -135,11 +135,11 @@ function(qt_android_dependencies target)
|
||||
# Bundled Jar Dependencies
|
||||
if(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)
|
||||
set(init_class "initClass=\"${init_class}\"")
|
||||
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")
|
||||
endforeach()
|
||||
endif()
|
||||
|
Loading…
x
Reference in New Issue
Block a user