summaryrefslogtreecommitdiff
path: root/xmake
diff options
context:
space:
mode:
authorruki <[email protected]>2024-11-29 12:24:50 +0800
committerGitHub <[email protected]>2024-11-29 12:24:50 +0800
commitea71bb8cbde3706e801414a2ef993557fe388b79 (patch)
tree2768be55463245ba1116bcdbccc07f11de8cd290 /xmake
parent24474296c05b1b9dcb6c31443c5627907c91a68c (diff)
parent4b1437e4deca1251ca054f3d69ea96b00644a53c (diff)
Merge pull request #5903 from Doekin/qmltyperegistrar
improve QML Plugin
Diffstat (limited to 'xmake')
-rw-r--r--xmake/rules/qt/qmltyperegistrar/xmake.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua
index 172bfd92b..8e25f109e 100644
--- a/xmake/rules/qt/qmltyperegistrar/xmake.lua
+++ b/xmake/rules/qt/qmltyperegistrar/xmake.lua
@@ -102,7 +102,7 @@ rule("qt.qmltyperegistrar")
-- gen sourcefile
batchcmds:show_progress(opt.progress, "${color.build.object}generating.qt.qmltyperegistrar %s", path.filename(sourcefile))
- qmltype_source = os.vrunv(qmltyperegistrar, table.join(args, metatypefiles))
+ batchcmds:vrunv(qmltyperegistrar, table.join(args, metatypefiles))
-- add objectfile
local objectfile = target:objectfile(sourcefile)
@@ -118,8 +118,8 @@ rule("qt.qmltyperegistrar")
end)
after_build(function(target)
- local qmldir = path.join(target:scriptdir(), target:values("qt.qmlplugin.qmldirfile"))
+ local qmldir = target:values("qt.qmlplugin.qmldirfile")
if qmldir then
- os.cp(qmldir, target:targetdir())
+ os.cp(path.join(target:scriptdir(), qmldir), target:targetdir())
end
end)