From fbcee97a64fc80ac14205e0c206d715070cd7613 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 31 Mar 2023 23:43:47 +0800 Subject: Update xmake.lua --- xmake/rules/qt/xmake.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xmake/rules/qt/xmake.lua b/xmake/rules/qt/xmake.lua index 3815b8a11..0a75e6e08 100644 --- a/xmake/rules/qt/xmake.lua +++ b/xmake/rules/qt/xmake.lua @@ -221,11 +221,9 @@ rule("qt.quickapp_static") -- https://github.com/xmake-io/xmake/issues/1047 -- https://github.com/xmake-io/xmake/issues/2791 local QtPlatformSupport - local OldQtWasm = true; if qt_sdkver then if qt_sdkver:ge("6.0") then QtPlatformSupport = nil - OldQtWasm = false; elseif qt_sdkver:ge("5.9") then QtPlatformSupport = "QtPlatformCompositorSupport" else @@ -250,7 +248,7 @@ rule("qt.quickapp_static") end elseif target:is_plat("wasm") then plugins.QWasmIntegrationPlugin = {linkdirs = "plugins/platforms", links = {"qwasm"}} - if OldQtWasm then + if qt_sdkver and qt_sdkver:lt("6.0") then table.join2(frameworks, "QtEventDispatcherSupport", "QtFontDatabaseSupport", "QtEglSupport") end end -- cgit v1.3.1