From c709a0f124d6028005bae7ec7c2b1c92b46a3c3a Mon Sep 17 00:00:00 2001 From: holub Date: Sat, 22 Mar 2025 19:40:50 -0400 Subject: [PATCH] build: Fixed QT6 build for macosx (#13510) --- scripts/src/osd/modules.lua | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 2a5f1a1ec8c..0dd3e561731 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -498,14 +498,23 @@ function osdmodulestargetconf() "Qt5Widgets.dll", } elseif _OPTIONS["targetos"]=="macosx" then + local qt_version = str_to_version(backtick("qmake -query QT_VERSION")) linkoptions { "-F" .. backtick("qmake -query QT_INSTALL_LIBS"), } - links { - "Qt5Core.framework", - "Qt5Gui.framework", - "Qt5Widgets.framework", - } + if qt_version < 60000 then + links { + "Qt5Core.framework", + "Qt5Gui.framework", + "Qt5Widgets.framework", + } + else + links { + "QtCore.framework", + "QtGui.framework", + "QtWidgets.framework", + } + end else if _OPTIONS["QT_HOME"]~=nil then local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION"))