From 165465ee7116bbbd8c0dd2ae04c2037c45f208a8 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 2 Aug 2017 20:41:22 +0200 Subject: Add --gradle to androiddeployqt Otherwise when trying to build with the newest Qt/android toolchains it fails Differential Revision: https://phabricator.kde.org/D6875 --- toolchain/Android.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index a1f647ed..201880fd 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -243,7 +243,7 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}" COMMAND cmake -E copy "$" "${EXECUTABLE_DESTINATION_PATH}" COMMAND cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET_DIR=$" "-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" "-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake - COMMAND $/androiddeployqt --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled "\\$(ARGS)" + COMMAND $/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled "\\$(ARGS)" ) add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET} -- cgit v1.2.1