diff options
| author | ruki <[email protected]> | 2022-05-20 07:13:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-20 07:13:42 +0800 |
| commit | c6218b9b4cd17babf15fa46dbc65e895ace3e7d7 (patch) | |
| tree | 6bb20d0701184a2a9e8af482cc7b16d971e647ec | |
| parent | 8b09757e778376392e242ffebdf5d29d88e1d0ea (diff) | |
| parent | f2cfa5714f67e3d0e7700ebaf84d5c1958e6f93f (diff) | |
Merge pull request #2367 from SirLynix/patch-11
Qt: add missing keys in android-deployment-settings.json
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua index 2677c6a49..c5bc810c4 100644 --- a/xmake/rules/qt/deploy/android.lua +++ b/xmake/rules/qt/deploy/android.lua @@ -25,6 +25,7 @@ import("core.base.semver") import("core.project.config") import("core.project.depend") import("core.tool.toolchain") +import("lib.detect.find_file") import("utils.progress") -- escape path @@ -158,6 +159,19 @@ function main(target, opt) if os.isexec(qmlimportscanner) then settings_file:print(' "qml-importscanner-binary": "%s",', _escape_path(qmlimportscanner)) end + -- for 6.3.x + local rcc = path.join(qt.bindir, "rcc") + if not os.isexec(rcc) and qt.bindir_host then + rcc = path.join(qt.bindir_host, "rcc") + end + if os.isexec(rcc) then + settings_file:print(' "rcc-binary": "%s",', _escape_path(rcc)) + end + local platformplugin = find_file("libplugins_platforms_qtforandroid_" .. target_arch .. "*", path.join(qt.sdkdir, "plugins", "platforms")) + if platformplugin then + settings_file:print(' "deployment-dependencies": {"%s":"%s"},', target_arch, _escape_path(platformplugin)) + end + local minsdkversion = target:values("qt.android.minsdkversion") if minsdkversion then settings_file:print(' "android-min-sdk-version": "%s",', tostring(minsdkversion)) |