diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -216,6 +216,7 @@ # needed for Qt to define Q_OS_ANDROID add_definitions(-DANDROID) +set(ECM_DIR "${CMAKE_CURRENT_LIST_DIR}/.." CACHE STRING "") ######### generation @@ -242,6 +243,10 @@ 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)" ) + + add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET} + COMMAND adb install -r "${EXPORT_DIR}/bin/QtApp-debug.apk" + ) else() message(STATUS "You can export a target by specifying -DQTANDROID_EXPORTED_TARGET=") endif() diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -8,6 +8,7 @@ "ndk-host": "@_HOST@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", + "qml-root-path": "@CMAKE_INSTALL_PREFIX@/share", ##EXTRALIBS## ##EXTRAPLUGINS## "android-package-source-directory": "@ANDROID_APK_DIR@",