1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Remove linkage to AGL framework

Browse Source 
It's no longer available on macOS 26, and we don't use it anymore
anyways.

Pick-to: 6.10 6.9 6.8 6.5
Change-Id: Ia1d0e37dda177f333646e598e517f4af20215dad
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2025-06-10 06:46:30 -07:00
parent 5e971101f0
commit cdb33c3d56
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindWrapOpenGL.cmake
View File

@ -37,16 +37,7 @@ if (OpenGL_FOUND)
set(__opengl_fw_path "-framework OpenGL") set(__opengl_fw_path "-framework OpenGL")
endif() endif()
find_library(WrapOpenGL_AGL NAMES AGL)
if(WrapOpenGL_AGL)
set(__opengl_agl_fw_path "${WrapOpenGL_AGL}")
endif()
if(NOT __opengl_agl_fw_path)
set(__opengl_agl_fw_path "-framework AGL")
endif()
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path}) target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path})
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path})
else() else()
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL) target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL)
endif() endif()

5
mkspecs/common/mac.conf
View File

@ -18,8 +18,7 @@ QMAKE_LIBDIR =
# sdk.prf will prefix the proper SDK sysroot # sdk.prf will prefix the proper SDK sysroot
QMAKE_INCDIR_OPENGL = \ QMAKE_INCDIR_OPENGL = \
/System/Library/Frameworks/OpenGL.framework/Headers \ /System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers/
QMAKE_FIX_RPATH = install_name_tool -id QMAKE_FIX_RPATH = install_name_tool -id
@ -30,7 +29,7 @@ QMAKE_LFLAGS_REL_RPATH =
QMAKE_REL_RPATH_BASE = @loader_path QMAKE_REL_RPATH_BASE = @loader_path
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL = -framework OpenGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =
QMAKE_INCDIR_WAYLAND = QMAKE_INCDIR_WAYLAND =