From 66980668db321501ed9d08599d7747840b2f04bd Mon Sep 17 00:00:00 2001
From: f11st <505654549@qq.com>
Date: Fri, 7 Jun 2024 01:34:52 +0800
Subject: Fix syslinks error using qt static lib in mingw

---
 xmake/rules/qt/load.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 070ae2c0d..8741d1e14 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -158,6 +158,9 @@ function _add_qmakeprllibs(target, prlfile, qtlibdir)
                     target:add("linkdirs", libdir)
                 else
                     local libstr = string.gsub(lib, "%$%$%[QT_INSTALL_LIBS%]", qtlibdir)
+                    if libstr:startswith("-l") then
+                        libstr = lib:sub(3)
+                    end
                     target:add("syslinks", libstr)
                 end
             end
-- 
cgit v1.3.1


From cb681629602499a58af74b2c1e19f6f7e606afc7 Mon Sep 17 00:00:00 2001
From: f11st <505654549@qq.com>
Date: Fri, 7 Jun 2024 01:34:52 +0800
Subject: Fix syslinks error using qt static lib in mingw

---
 xmake/rules/qt/load.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 8741d1e14..2eef2297a 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -264,6 +264,7 @@ function main(target, opt)
     target:set("syslinks", nil)
 
     -- add qt links and directories
+    target:add("syslinks", target:values("qt.links"))
     local qtprldirs = {}
     for _, qt_linkdir in ipairs(target:values("qt.linkdirs")) do
         local linkdir = path.join(qt.sdkdir, qt_linkdir)
@@ -278,7 +279,6 @@ function main(target, opt)
             _add_qmakeprllibs(target, prl_file, qt.libdir)
         end
     end
-    target:add("syslinks", target:values("qt.links"))
 
     -- backup qt frameworks
     local qt_frameworks = target:get("frameworks")
-- 
cgit v1.3.1


From 0177dcd0311e2f9ca52675911904d34aa40cbbb6 Mon Sep 17 00:00:00 2001
From: f11st <505654549@qq.com>
Date: Fri, 7 Jun 2024 01:34:52 +0800
Subject: Fix syslinks error using qt static lib in mingw

---
 xmake/rules/qt/load.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 2eef2297a..b5490ee79 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -159,7 +159,7 @@ function _add_qmakeprllibs(target, prlfile, qtlibdir)
                 else
                     local libstr = string.gsub(lib, "%$%$%[QT_INSTALL_LIBS%]", qtlibdir)
                     if libstr:startswith("-l") then
-                        libstr = lib:sub(3)
+                        libstr = libstr:sub(3)
                     end
                     target:add("syslinks", libstr)
                 end
-- 
cgit v1.3.1