summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-07-13 17:28:27 +0800
committerGitHub <[email protected]>2022-07-13 17:28:27 +0800
commitc7e36432d1c9100a5e9fb2c60d511c616daa5888 (patch)
treef74af3c58006b0bca9639bc7c22581f7e8b97809
parent8a7ac7b30eb72112e67350a491d4c3f045f3d86b (diff)
parentdf580cb9db9ea8ec9679a275109135844685af27 (diff)
Merge pull request #2564 from Arthapz/Fix_qml_deploy_user_args
Fix user flags for *deployqt
-rw-r--r--xmake/rules/qt/deploy/android.lua2
-rw-r--r--xmake/rules/qt/deploy/macosx.lua2
-rw-r--r--xmake/rules/qt/install/windows.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index 5e6a641d8..2e2946194 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -220,7 +220,7 @@ function main(target, opt)
-- add user flags
local user_flags = target:values("qt.deploy.flags") or {}
if user_flags then
- table.join(argv, user_flags)
+ argv = table.join(argv, user_flags)
end
os.vrunv(androiddeployqt, argv)
diff --git a/xmake/rules/qt/deploy/macosx.lua b/xmake/rules/qt/deploy/macosx.lua
index e6223a8c7..12a1c6081 100644
--- a/xmake/rules/qt/deploy/macosx.lua
+++ b/xmake/rules/qt/deploy/macosx.lua
@@ -140,7 +140,7 @@ function main(target, opt)
-- add user flags
local user_flags = target:values("qt.deploy.flags") or {}
if user_flags then
- table.join(argv, user_flags)
+ argv = table.join(argv, user_flags)
end
os.vrunv(macdeployqt, argv)
diff --git a/xmake/rules/qt/install/windows.lua b/xmake/rules/qt/install/windows.lua
index 26ef5febb..d30ba2172 100644
--- a/xmake/rules/qt/install/windows.lua
+++ b/xmake/rules/qt/install/windows.lua
@@ -86,7 +86,7 @@ function main(target, opt)
-- add user flags
local user_flags = target:values("qt.deploy.flags") or {}
if user_flags then
- table.join(argv, user_flags)
+ argv = table.join(argv, user_flags)
end
table.insert(argv, installfile)