diff options
| author | ruki <[email protected]> | 2024-07-23 15:59:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-23 15:59:14 +0800 |
| commit | 06a90764a12521f4bb704d689e6313665934f2d4 (patch) | |
| tree | a5260a8ed9fcecfbf5c6592f81fa0a0a9b157794 | |
| parent | 9e1643aee954cdadea3eba96f3242b0a55ab6898 (diff) | |
| parent | 7d3d408bbcc69a62eef4e889990322c083c96cdd (diff) | |
Merge pull request #5381 from jingkaimori/jingkaimori/qt-install-improvement
fix error when qt.deploy.flags policy is a table
| -rw-r--r-- | xmake/rules/qt/install/mingw.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/install/windows.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/rules/qt/install/mingw.lua b/xmake/rules/qt/install/mingw.lua index d3fce6990..79a09065a 100644 --- a/xmake/rules/qt/install/mingw.lua +++ b/xmake/rules/qt/install/mingw.lua @@ -82,8 +82,8 @@ function main(target, opt) end -- make sure user flags have priority over default - local user_flags = target:values("qt.deploy.flags") - if not user_flags or not (user_flags:find("--debug", 1, true) or user_flags:find("--release", 1, true)) then + local user_flags = table.wrap(target:values("qt.deploy.flags")) + if table.contains(user_flags, "--debug", "--release") then if is_mode("debug") then table.insert(argv, "--debug") else diff --git a/xmake/rules/qt/install/windows.lua b/xmake/rules/qt/install/windows.lua index 06e61038b..7b8436e1b 100644 --- a/xmake/rules/qt/install/windows.lua +++ b/xmake/rules/qt/install/windows.lua @@ -92,8 +92,8 @@ function main(target, opt) end -- make sure user flags have priority over default - local user_flags = target:values("qt.deploy.flags") - if not user_flags or not (user_flags:find("--debug", 1, true) or user_flags:find("--release", 1, true)) then + local user_flags = table.wrap(target:values("qt.deploy.flags")) + if table.contains(user_flags, "--debug", "--release") then if is_mode("debug") then table.insert(argv, "--debug") else |