From 8cceb04232001e51276f1588d9e67f2c696fbe91 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Tue, 9 Feb 2021 12:46:11 +0100
Subject: Fix completely wrong init_class and jar_bundle_native values

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>
---
 cmake/QtAndroidHelpers.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/QtAndroidHelpers.cmake b/cmake/QtAndroidHelpers.cmake
index 7e84c983a9..1add6e883c 100644
--- a/cmake/QtAndroidHelpers.cmake
+++ b/cmake/QtAndroidHelpers.cmake
@@ -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()
-- 
cgit v1.2.3