diff options
| author | ruki <[email protected]> | 2024-07-16 09:34:16 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-16 09:34:16 +0800 |
| commit | 2e0fb34b2cd7824e9a4a92f307c33feea5634862 (patch) | |
| tree | 20ac4f88116a394360b466fa2e3e7728c6e79895 | |
| parent | 22df8e0d89a1d8f3358797ed2094f692be62b4e4 (diff) | |
| parent | de4548cd86ae0013a82268ba1256c3f54ff7a6b9 (diff) | |
Merge pull request #5351 from yh-sb/qt-deploy-flags
User's `qt.deploy.flags` should have priority over defaults
| -rw-r--r-- | xmake/rules/qt/install/mingw.lua | 13 | ||||
| -rw-r--r-- | xmake/rules/qt/install/windows.lua | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/xmake/rules/qt/install/mingw.lua b/xmake/rules/qt/install/mingw.lua index 663551090..d3fce6990 100644 --- a/xmake/rules/qt/install/mingw.lua +++ b/xmake/rules/qt/install/mingw.lua @@ -81,10 +81,14 @@ function main(target, opt) table.insert(argv, "--verbose=0") end - if is_mode("debug") then - table.insert(argv, "--debug") - else - table.insert(argv, "--release") + -- 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 + if is_mode("debug") then + table.insert(argv, "--debug") + else + table.insert(argv, "--release") + end end if qmldir then @@ -92,7 +96,6 @@ function main(target, opt) end -- add user flags - local user_flags = target:values("qt.deploy.flags") or {} if user_flags then argv = table.join(argv, user_flags) end diff --git a/xmake/rules/qt/install/windows.lua b/xmake/rules/qt/install/windows.lua index 9877b0aaf..06e61038b 100644 --- a/xmake/rules/qt/install/windows.lua +++ b/xmake/rules/qt/install/windows.lua @@ -91,10 +91,14 @@ function main(target, opt) table.insert(argv, "--verbose=0") end - if is_mode("debug") then - table.insert(argv, "--debug") - else - table.insert(argv, "--release") + -- 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 + if is_mode("debug") then + table.insert(argv, "--debug") + else + table.insert(argv, "--release") + end end if qmldir then @@ -102,7 +106,6 @@ function main(target, opt) end -- add user flags - local user_flags = target:values("qt.deploy.flags") or {} if user_flags then argv = table.join(argv, user_flags) end |