From 29fe11a32173539feca184c65bae6ccb643f5c50 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 19 May 2022 13:35:58 +0200 Subject: Improve Qt support on Windows --- xmake/rules/qt/deploy/android.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmake/rules/qt/deploy/android.lua') 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 -- cgit v1.3.1