From b54cad58f33556bf15a75152ecbfdfa585293a1a Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Mon, 26 Jul 2021 16:51:54 +0300
Subject: [PATCH] try add support android qt6

---
 AddQtAndroidApk.cmake | 8 +++++---
 qtdeploy.json.in      | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/AddQtAndroidApk.cmake b/AddQtAndroidApk.cmake
index a458627..4719c71 100644
--- a/AddQtAndroidApk.cmake
+++ b/AddQtAndroidApk.cmake
@@ -32,13 +32,15 @@ if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     endif()
 
     set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_HOST_PATH}")
-    set(ANDROID_INPUT_JSON  ${CMAKE_CURRENT_BINARY_DIR}/android-${SOURCE_TARGET}-deployment-settings.json)
+
 else()
     set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_ANDROID_QT_ROOT}")
-    set(ANDROID_INPUT_JSON  ${CMAKE_CURRENT_BINARY_DIR}/qtdeploy.json)
 
 endif()
 
+set(QT_ANDROID_IMPORTSCANER_BINARY "${ANDROID_DEPLOY_TOOL_ROOT_PATH}/bin/qmlimportscanner")
+set(QT_ANDROID_RCC_BINARY "${ANDROID_DEPLOY_TOOL_ROOT_PATH}/libexec/rcc")
+
 # find the Android SDK
 if(NOT QT_ANDROID_SDK_ROOT)
     set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
@@ -313,7 +315,7 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET)
         --verbose
         --aab
         --output ${QT_ANDROID_APP_BINARY_DIR}
-        --input ${ANDROID_INPUT_JSON}
+        --input ${CMAKE_CURRENT_BINARY_DIR}/qtdeploy.json
         --gradle
         ${QT_ANDROID_BUILD_TYPE}
         ${TARGET_LEVEL_OPTIONS}
diff --git a/qtdeploy.json.in b/qtdeploy.json.in
index 00fbd52..72c0d07 100644
--- a/qtdeploy.json.in
+++ b/qtdeploy.json.in
@@ -13,6 +13,8 @@
  },
  "target-architecture": "@ANDROID_ABI@",
  "application-binary": "@QT_ANDROID_APPLICATION_BINARY@",
+ "qml-importscanner-binary" : "@QT_ANDROID_IMPORTSCANER_BINARY@",
+ "rcc-binary" : "@QT_ANDROID_RCC_BINARY@",
  "android-package": "@QT_ANDROID_APP_PACKAGE_NAME@",
  "android-app-name": "@QT_ANDROID_APP_NAME@",
  "qml-root-path": "@CMAKE_SOURCE_DIR@",