From de4548cd86ae0013a82268ba1256c3f54ff7a6b9 Mon Sep 17 00:00:00 2001
From: yh-sb <yh.sb@outlook.com>
Date: Mon, 15 Jul 2024 20:14:11 +0300
Subject: [PATCH] User's qt.deploy.flags have priority over defaults

---
 xmake/rules/qt/install/mingw.lua   | 13 ++++++++-----
 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 6635510904a..d3fce699054 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 9877b0aaff2..06e61038be5 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