summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2022-06-10 00:03:25 +0200
committerArthur LAURENT <[email protected]>2022-06-10 00:03:25 +0200
commitf8358f12d79b373fceee3fd8213ef00045028f39 (patch)
tree06fe9c737f4021711ebaad1f054df7977ba58e23
parent7b9a4f0ce02fc059e76fa9cba90425fd75f0326e (diff)
Fix missing moc json generation
-rw-r--r--xmake/rules/qt/moc/xmake.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua
index 7cb62b9bb..2092ebe71 100644
--- a/xmake/rules/qt/moc/xmake.lua
+++ b/xmake/rules/qt/moc/xmake.lua
@@ -80,7 +80,7 @@ rule("qt.moc")
end
local user_flags = target:get("qt.moc.flags") or {}
batchcmds:mkdir(path.directory(sourcefile_moc))
- batchcmds:vrunv(moc, table.join(flags, path(sourcefile), "-o", path(sourcefile_moc)))
+ batchcmds:vrunv(moc, table.join(user_flags, flags, path(sourcefile), "-o", path(sourcefile_moc)))
-- we need compile this moc_xxx.cpp file if exists Q_PRIVATE_SLOT, @see https://github.com/xmake-io/xmake/issues/750
local mocdata = io.readfile(sourcefile)