QuasarApp/qt-android-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-04-30 23:54:33 +00:00
Code Issues Projects Releases Wiki Activity

try add support android qt6

Browse Source
This commit is contained in:
Andrei Yankovich 2021-07-26 16:51:54 +03:00
parent 394edfcdc7
commit b54cad58f3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AddQtAndroidApk.cmake
View File

@ -32,13 +32,15 @@ if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
endif() endif()
set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_HOST_PATH}") set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_HOST_PATH}")
set(ANDROID_INPUT_JSON ${CMAKE_CURRENT_BINARY_DIR}/android-${SOURCE_TARGET}-deployment-settings.json)
else() else()
set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_ANDROID_QT_ROOT}") set(ANDROID_DEPLOY_TOOL_ROOT_PATH "${QT_ANDROID_QT_ROOT}")
set(ANDROID_INPUT_JSON ${CMAKE_CURRENT_BINARY_DIR}/qtdeploy.json)
endif() 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 # find the Android SDK
if(NOT QT_ANDROID_SDK_ROOT) if(NOT QT_ANDROID_SDK_ROOT)
set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK}) set(QT_ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
@ -313,7 +315,7 @@ macro(add_qt_android_apk TARGET SOURCE_TARGET)
--verbose --verbose
--aab --aab
--output ${QT_ANDROID_APP_BINARY_DIR} --output ${QT_ANDROID_APP_BINARY_DIR}
--input ${ANDROID_INPUT_JSON} --input ${CMAKE_CURRENT_BINARY_DIR}/qtdeploy.json
--gradle --gradle
${QT_ANDROID_BUILD_TYPE} ${QT_ANDROID_BUILD_TYPE}
${TARGET_LEVEL_OPTIONS} ${TARGET_LEVEL_OPTIONS}

2
qtdeploy.json.in
View File

@ -13,6 +13,8 @@
}, },
"target-architecture": "@ANDROID_ABI@", "target-architecture": "@ANDROID_ABI@",
"application-binary": "@QT_ANDROID_APPLICATION_BINARY@", "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-package": "@QT_ANDROID_APP_PACKAGE_NAME@",
"android-app-name": "@QT_ANDROID_APP_NAME@", "android-app-name": "@QT_ANDROID_APP_NAME@",
"qml-root-path": "@CMAKE_SOURCE_DIR@", "qml-root-path": "@CMAKE_SOURCE_DIR@",