summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-12-25 14:07:26 +0800
committerruki <[email protected]>2022-12-25 14:07:26 +0800
commitfaf9f50d8204869ef5c5fc3a5a86cf6205e6e896 (patch)
tree43f497e3d4a3ed0b095dbcf8d52d864c95c851b6
parent3dde749a166fffa3b25f04eedf10d83ec1869e21 (diff)
improve qt
-rw-r--r--xmake/rules/qt/xmake.lua20
1 files changed, 12 insertions, 8 deletions
diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua
index 21d3098c9..d706f2e18 100644
--- a/xmake/rules/qt/xmake.lua
+++ b/xmake/rules/qt/xmake.lua
@@ -133,12 +133,14 @@ rule("qt.widgetapp_static")
-- @see
-- https://github.com/xmake-io/xmake/issues/1047
-- https://github.com/xmake-io/xmake/issues/2791
- local QtPlatformSupport = "QtPlatformSupport"
+ local QtPlatformSupport
if qt_sdkver then
- if qt_sdkver:ge("5.9") then
- QtPlatformSupport = "QtPlatformCompositorSupport"
- elseif qt_sdkver:ge("6.0") then
+ if qt_sdkver:ge("6.0") then
QtPlatformSupport = nil
+ elseif qt_sdkver:ge("5.9") then
+ QtPlatformSupport = "QtPlatformCompositorSupport"
+ else
+ QtPlatformSupport = "QtPlatformSupport"
end
end
@@ -218,12 +220,14 @@ rule("qt.quickapp_static")
-- @see
-- https://github.com/xmake-io/xmake/issues/1047
-- https://github.com/xmake-io/xmake/issues/2791
- local QtPlatformSupport = "QtPlatformSupport"
+ local QtPlatformSupport
if qt_sdkver then
- if qt_sdkver:ge("5.9") then
- QtPlatformSupport = "QtPlatformCompositorSupport"
- elseif qt_sdkver:ge("6.0") then
+ if qt_sdkver:ge("6.0") then
QtPlatformSupport = nil
+ elseif qt_sdkver:ge("5.9") then
+ QtPlatformSupport = "QtPlatformCompositorSupport"
+ else
+ QtPlatformSupport = "QtPlatformSupport"
end
end