diff options
| author | ruki <[email protected]> | 2022-01-04 16:29:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-01-04 16:29:46 +0800 |
| commit | 339599e277f031a701dad5aa9690a5db2cf3bc5e (patch) | |
| tree | 1e70ef402805c69374e088deb904b293f9d64716 | |
| parent | 001af5a8122223a2cacc514525f72aa5f853ab82 (diff) | |
add qmlimportscanner
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua index 8076671e6..23c0f5cb8 100644 --- a/xmake/rules/qt/deploy/android.lua +++ b/xmake/rules/qt/deploy/android.lua @@ -162,6 +162,14 @@ function main(target, opt) settings_file:print(' "ndk-host": "%s",', ndk_host) 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 "moc.exe" or "moc")) + if not os.isexec(qmlimportscanner) and qt.libexecdir_host then + qmlimportscanner = path.join(qt.libexecdir_host, "qmlimportscanner" .. (is_host("windows") and "moc.exe" or "moc")) + end + if os.isexec(qmlimportscanner) then + settings_file:print(' "qml-importscanner-binary": "%s",', qmlimportscanner) + end if android_srcs then settings_file:print(' "android-package-source-directory": "%s",', _escape_path(android_srcs)) --settings_file:print(' "android-extra-libs":"c:/libs",') |