summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-08-22 00:02:30 +0800
committerruki <[email protected]>2025-08-22 00:02:30 +0800
commit6c32c626c5f251728c26a5642e11c8c1943bd6b9 (patch)
tree18fcd8f1becba9dfef47b40e731de7496204e88e
parentec1f7332a6981df06647e981fafbf10a34e36ffc (diff)
fix qmltyperegistrar path #6733
-rw-r--r--xmake/rules/qt/qmltyperegistrar/xmake.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua
index b87325b67..9ad7682ad 100644
--- a/xmake/rules/qt/qmltyperegistrar/xmake.lua
+++ b/xmake/rules/qt/qmltyperegistrar/xmake.lua
@@ -58,8 +58,8 @@ rule("qt.qmltyperegistrar")
target:add("installfiles", path.join(target:get("targetdir"), "plugin.qmltypes"), { prefixdir = path.join("bin", table.unpack(importname:split(".", { plain = true }))) })
local genbasename = path.join(target:autogendir(), "rules", "qt", "qmltyperegistrar", target:name())
- local metatypesfile = path(genbasename .. "_metatypes.json")
- local sourcefile = path(genbasename .. "_qmltyperegistrations.cpp")
+ local metatypesfile = genbasename .. "_metatypes.json"
+ local sourcefile = genbasename .. "_qmltyperegistrations.cpp"
local sourcefile_dir = path.directory(sourcefile)
os.mkdir(sourcefile_dir)
target:data_set("qt.qmlplugin.metatypesfile", metatypesfile)
@@ -101,7 +101,7 @@ rule("qt.qmltyperegistrar")
-- @see https://github.com/xmake-io/xmake/issues/6647
local moc_args = {
"--collect-json",
- "-o", metatypesfile
+ "-o", path(metatypesfile)
}
batchcmds:show_progress(opt.progress, "${color.build.object}generating.qt.qmltyperegistrar %s", path.filename(metatypesfile))
batchcmds:vrunv(moc, table.join(moc_args, metatype_files))
@@ -112,8 +112,8 @@ rule("qt.qmltyperegistrar")
"--import-name=" .. importname,
"--major-version=" .. majorversion,
"--minor-version=" .. minorversion,
- "-o", sourcefile,
- metatypesfile
+ "-o", path(sourcefile),
+ path(metatypesfile)
}
batchcmds:show_progress(opt.progress, "${color.build.object}generating.qt.qmltyperegistrar %s", path.filename(sourcefile))
batchcmds:vrunv(qmltyperegistrar, args)