From c5d92deff24578f8258a724ca8a143c2d5f390a1 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Thu, 16 Mar 2017 03:31:12 +0100
Subject: Specify qml-root-path as the share directory in the prefix

Summary:
This way androiddeployqt will scan the imports.
Otherwise it wouldn't pull qtquickcontrols2 for me

Reviewers: #build_system, #frameworks, mart

Reviewed By: mart

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D5067
---
 toolchain/Android.cmake | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'toolchain/Android.cmake')

diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index 9fed3610..9600e655 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -216,6 +216,7 @@ set(CMAKE_CXX_LINK_EXECUTABLE
 # 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 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME})
         COMMAND cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>" "-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" "-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake
         COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/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=<targetname>")
 endif()
-- 
cgit v1.2.1