summaryrefslogtreecommitdiff
path: root/xmake/rules/qt/deploy/android.lua
diff options
context:
space:
mode:
authorSirLynix <[email protected]>2022-05-19 13:35:58 +0200
committerSirLynix <[email protected]>2022-05-19 13:35:58 +0200
commit29fe11a32173539feca184c65bae6ccb643f5c50 (patch)
treece0e444ad0deb02f548c39069f80b362763d1ea4 /xmake/rules/qt/deploy/android.lua
parent9ffc16b9f9dbe8e01a6881435469630558c319bf (diff)
Improve Qt support on Windows
Diffstat (limited to 'xmake/rules/qt/deploy/android.lua')
-rw-r--r--xmake/rules/qt/deploy/android.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index 326addbc1..2677c6a49 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -151,12 +151,12 @@ function main(target, opt)
settings_file:print(' "target-architecture": "%s",', target_arch)
settings_file:print(' "qml-root-path": "%s",', _escape_path(os.projectdir()))
-- for 6.2.x
- local qmlimportscanner = path.join(qt.libexecdir, "qmlimportscanner" .. (is_host("windows") and ".exe" or ""))
+ local qmlimportscanner = path.join(qt.libexecdir, "qmlimportscanner")
if not os.isexec(qmlimportscanner) and qt.libexecdir_host then
- qmlimportscanner = path.join(qt.libexecdir_host, "qmlimportscanner" .. (is_host("windows") and ".exe" or ""))
+ qmlimportscanner = path.join(qt.libexecdir_host, "qmlimportscanner")
end
if os.isexec(qmlimportscanner) then
- settings_file:print(' "qml-importscanner-binary": "%s",', qmlimportscanner)
+ settings_file:print(' "qml-importscanner-binary": "%s",', _escape_path(qmlimportscanner))
end
local minsdkversion = target:values("qt.android.minsdkversion")
if minsdkversion then