diff options
| author | ruki <[email protected]> | 2022-05-19 22:31:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-19 22:31:14 +0800 |
| commit | 8b09757e778376392e242ffebdf5d29d88e1d0ea (patch) | |
| tree | 50e38b0da3dbacb38012a665b45f8788221836f8 /xmake/rules/qt/deploy/android.lua | |
| parent | 3674a502ae48035813cac69525162d7a7f89ba28 (diff) | |
| parent | 29fe11a32173539feca184c65bae6ccb643f5c50 (diff) | |
Merge pull request #2366 from SirLynix/improve_qt
Improve Qt 6.3 support on Windows
Diffstat (limited to 'xmake/rules/qt/deploy/android.lua')
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 6 |
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 |