aboutsummaryrefslogtreecommitdiff
path: root/toolchain/deployment-file.json.in
diff options
context:
space:
mode:
authorSharaf Zaman <sharafzaz121@gmail.com>2020-10-21 12:23:06 +0000
committerSharaf Zaman <sharafzaz121@gmail.com>2020-10-21 14:54:31 +0000
commit0dc7bd82b03387183bb389ffbd5a28876ba3ed31 (patch)
tree0ea44a47a68f8ec2d830d690760d33c3c1ef2dea /toolchain/deployment-file.json.in
parente3dd0a50689620c0ecbfc722cd9e9c9aabe6d63d (diff)
downloadextra-cmake-modules-0dc7bd82b03387183bb389ffbd5a28876ba3ed31.tar.gz
extra-cmake-modules-0dc7bd82b03387183bb389ffbd5a28876ba3ed31.tar.bz2
Include option to use LLVM for users with Qt < 5.14
When NDK r20+ is used along with Qt5.12, APK generation fails because of the layout change in newer NDK. This patch introduces a new variable USE_LLVM, when this is set for older Qt versions, androiddeployqt uses LLVM's tools.
Diffstat (limited to 'toolchain/deployment-file.json.in')
-rw-r--r--toolchain/deployment-file.json.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in
index 206e069d..c870b5f4 100644
--- a/toolchain/deployment-file.json.in
+++ b/toolchain/deployment-file.json.in
@@ -17,5 +17,6 @@
"sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
"android-min-sdk-version": "@ANDROID_API_LEVEL@",
"android-target-sdk-version": "@ANDROID_SDK_COMPILE_API@",
- "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ]
+ "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ],
+ "useLLVM": ##USE_LLVM##
}