diff options
| author | ruki <[email protected]> | 2025-12-01 18:49:31 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-01 18:49:31 +0800 |
| commit | 92b61ab2648cc37da47874a4bab4d487a9a01202 (patch) | |
| tree | c901f5971d39f34bb7fd72fec9cf3b265bfc4f15 | |
| parent | 012ebb34441d6b0e05f9bb5a5e28759fc1502e89 (diff) | |
| parent | d42f0790327b8e64474575bc86491fb2642f797c (diff) | |
Merge pull request #7086 from xmake-io/qml
fix targetdir in qml rule
| -rw-r--r-- | xmake/rules/qt/qmltyperegistrar/xmake.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/rules/qt/qmltyperegistrar/xmake.lua b/xmake/rules/qt/qmltyperegistrar/xmake.lua index 9ad7682ad..bc60bdf03 100644 --- a/xmake/rules/qt/qmltyperegistrar/xmake.lua +++ b/xmake/rules/qt/qmltyperegistrar/xmake.lua @@ -55,7 +55,7 @@ rule("qt.qmltyperegistrar") end -- add qmltypes - target:add("installfiles", path.join(target:get("targetdir"), "plugin.qmltypes"), { prefixdir = path.join("bin", table.unpack(importname:split(".", { plain = true }))) }) + target:add("installfiles", path.join(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 = genbasename .. "_metatypes.json" @@ -107,8 +107,9 @@ rule("qt.qmltyperegistrar") batchcmds:vrunv(moc, table.join(moc_args, metatype_files)) -- gen sourcefile + local targetdir = target:targetdir() local args = { - "--generate-qmltypes=" .. target:get("targetdir") .. "/plugin.qmltypes", + "--generate-qmltypes=" .. path(path.join(targetdir, "plugin.qmltypes")), "--import-name=" .. importname, "--major-version=" .. majorversion, "--minor-version=" .. minorversion, |