From bcf2bcf39b44cd1eecbcce5b99124b950eb39cfc Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 2 Jul 2017 10:24:36 +0200 Subject: Android: scan for qml files in the source dir, not in the install dir. Summary: When the QML files are all bundled into a .qrc file, they don't get copied to the install dir, which would lead to qmlimportscanner not picking up the dependencies (e.g. QtQuick Controls) for android packaging. Looking at commit 1b0496d, I wonder if maybe we should be able to specify two paths to look into? But qmlimportscanner doesn't support that, does it? Test Plan: using this toolchain for a basic QtQuick2 app created from a QtCreator template, with Qt Quick Controls support, and QML files in a Qt resource. Reviewers: apol, mart Reviewed By: apol Subscribers: #build_system, #frameworks Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D6466 --- toolchain/deployment-file.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index c33f1120..fe5f3fb6 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -8,7 +8,7 @@ "ndk-host": "@_HOST@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", - "qml-root-path": "@CMAKE_INSTALL_PREFIX@", + "qml-root-path": "@CMAKE_SOURCE_DIRECTORY@", ##EXTRALIBS## ##EXTRAPLUGINS## "android-package-source-directory": "@ANDROID_APK_DIR@", -- cgit v1.2.1