QuasarApp/qt-android-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/qt-android-cmake.git synced 2025-05-03 16:59:37 +00:00
Code Issues Projects Releases Wiki Activity

fix path to input files for the qt6

Browse Source
This commit is contained in:
Andrei Yankovich 2021-07-26 16:15:55 +03:00
parent cdff1dea7e
commit 394edfcdc7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AddQtAndroidApk.cmake
View File

@ -32,8 +32,11 @@ 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()
# find the Android SDK # find the Android SDK
@ -310,12 +313,12 @@ 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 ${CMAKE_CURRENT_BINARY_DIR}/qtdeploy.json --input ${ANDROID_INPUT_JSON}
--gradle --gradle
${QT_ANDROID_BUILD_TYPE} ${QT_ANDROID_BUILD_TYPE}
${TARGET_LEVEL_OPTIONS} ${TARGET_LEVEL_OPTIONS}
${INSTALL_OPTIONS} ${INSTALL_OPTIONS}
${SIGN_OPTIONS} # ${SIGN_OPTIONS}
) )
endmacro() endmacro()