summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-09-15 23:03:56 +0800
committerruki <[email protected]>2022-09-15 23:03:56 +0800
commitad4be9eaa77771aa816a63b8443eeb784a74498d (patch)
tree1118db936760f425ae406ddfd9cde3ebb2b578bc
parent561bca38feb074c60caf7460967bf4256d486292 (diff)
fix qt.moc
-rw-r--r--xmake/actions/build/kinds/object.lua5
-rw-r--r--xmake/rules/qt/moc/xmake.lua2
-rw-r--r--xmake/rules/qt/ui/xmake.lua1
3 files changed, 1 insertions, 7 deletions
diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua
index 7b77cd9b0..0498cf0d7 100644
--- a/xmake/actions/build/kinds/object.lua
+++ b/xmake/actions/build/kinds/object.lua
@@ -235,7 +235,6 @@ function _build_sourcebatch_groups_for_rules(groups, target, sourcebatches)
local rulename = assert(sourcebatch.rulename, "unknown rule for sourcebatch!")
local ruleinst = _get_rule(rulename)
local depth = _get_rule_max_depth(ruleinst, 1)
- print(rulename, depth)
local group = groups[depth]
if group == nil then
group = {}
@@ -259,10 +258,6 @@ function _build_sourcebatch_groups(target, sourcebatches)
if #groups > 0 then
groups = table.reverse(groups)
end
- --[[
- for idx, group in ipairs(groups) do
- print(idx, table.keys(group))
- end]]
return groups
end
diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua
index e4abbbb84..d520596b6 100644
--- a/xmake/rules/qt/moc/xmake.lua
+++ b/xmake/rules/qt/moc/xmake.lua
@@ -20,7 +20,7 @@
rule("qt.moc")
add_deps("qt.env")
--- add_deps("qt.ui", {order = true})
+ add_deps("qt.ui", {order = true})
set_extensions(".h", ".hpp")
before_buildcmd_file(function (target, batchcmds, sourcefile, opt)
diff --git a/xmake/rules/qt/ui/xmake.lua b/xmake/rules/qt/ui/xmake.lua
index 87afdeb58..52e1a5228 100644
--- a/xmake/rules/qt/ui/xmake.lua
+++ b/xmake/rules/qt/ui/xmake.lua
@@ -20,7 +20,6 @@
rule("qt.ui")
add_deps("qt.env")
- add_deps("qt.moc", {order = true})
set_extensions(".ui")
on_load(function (target)