From faf9f50d8204869ef5c5fc3a5a86cf6205e6e896 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 25 Dec 2022 14:07:26 +0800 Subject: improve qt --- xmake/rules/qt/xmake.lua | 20 ++++++++++++-------- 1 file 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 -- cgit v1.3.1