diff options
| author | Jérôme Leclercq <[email protected]> | 2022-05-19 18:28:07 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-19 18:28:07 +0200 |
| commit | 31fea661bb212636b9eca92fd18e6caf80cc2ee3 (patch) | |
| tree | 7e1c7b2057313600c482c3a2e2456e5d68ca43bb | |
| parent | 8b09757e778376392e242ffebdf5d29d88e1d0ea (diff) | |
Qt: add missing keys in android-deployment-settings.json
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua index 2677c6a49..d5793ad93 100644 --- a/xmake/rules/qt/deploy/android.lua +++ b/xmake/rules/qt/deploy/android.lua @@ -158,6 +158,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 = os.files(path.join(qt.sdkdir, "plugins", "platforms", "libplugins_platforms_qtforandroid_" .. target_arch .. "*")) + if #platformplugin > 0 then + settings_file:print(' "deployment-dependencies": {"%s":"%s"},', target_arch, _escape_path(platformplugin[1])) + end + local minsdkversion = target:values("qt.android.minsdkversion") if minsdkversion then settings_file:print(' "android-min-sdk-version": "%s",', tostring(minsdkversion)) |