Merge pull request xmake-io#5351 from yh-sb/qt-deploy-flags

User's `qt.deploy.flags` should have priority over defaults
A2va · Jul 16, 2024 · 2e0fb34 · 2e0fb34
2 parents 22df8e0 + de4548c
commit 2e0fb34
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/xmake/rules/qt/install/mingw.lua b/xmake/rules/qt/install/mingw.lua
@@ -81,18 +81,21 @@ 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
         table.insert(argv, "--qmldir=" .. qmldir)
     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
@@ -91,18 +91,21 @@ 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
         table.insert(argv, "--qmldir=" .. qmldir)
     end
 
     -- add user flags
-    local user_flags = target:values("qt.deploy.flags") or {}
     if user_flags then
         argv = table.join(argv, user_flags)
     end