From 34dd0f03af660bef5c62efc4c77c16da66c1a579 Mon Sep 17 00:00:00 2001 From: carols Date: Thu, 29 Sep 2022 20:30:07 +0800 Subject: fix link error on linux when use qt4 --- xmake/rules/qt/load.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index ee4a3f601..4e76fe348 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -39,7 +39,11 @@ function _link(target, linkdirs, framework, qt_sdkver) if qt_sdkver:ge("5.0") then framework = "Qt" .. qt_sdkver:major() .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") else -- for qt4.x, e.g. QtGui4.lib - framework = "Qt" .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") .. qt_sdkver:major() + if target:is_plat("windows") or target:is_plat("mingw") then + framework = "Qt" .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") .. qt_sdkver:major() + else + framework = "Qt" .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") + end end if target:is_plat("android") then --> -lQt5Core_armeabi/-lQt5CoreDebug_armeabi for 5.14.x local libinfo = find_library(framework .. "_" .. config.arch(), linkdirs) -- cgit v1.3.1 From 4b3c3dc436ccc316db0219cf1cd4f175482eb555 Mon Sep 17 00:00:00 2001 From: "shaoxie1986@163.com" Date: Thu, 29 Sep 2022 21:24:53 +0800 Subject: Simplify code --- 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 4e76fe348..7d641b134 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -39,7 +39,7 @@ function _link(target, linkdirs, framework, qt_sdkver) if qt_sdkver:ge("5.0") then framework = "Qt" .. qt_sdkver:major() .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") else -- for qt4.x, e.g. QtGui4.lib - if target:is_plat("windows") or target:is_plat("mingw") then + if target:is_plat("windows", "mingw") then framework = "Qt" .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") .. qt_sdkver:major() else framework = "Qt" .. framework:sub(3) .. (is_mode("debug") and debug_suffix or "") -- cgit v1.3.1