opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-01 15:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Cleanup Qt GuiPrivate linkage

Browse Source 
Remove unneeded linkages and guard needed ones for Qt versions earlier
than 6.9.0.
This commit is contained in:
tytan652
2025-07-01 20:53:48 +02:00
committed by Ryan Foster
parent cd4d624ec3
commit c142571d5c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/cmake/os-freebsd.cmake
+5 -1
View File
@@ -7,7 +7,11 @@ target_sources(
utility/system-info-posix.cpp
)
target_compile_definitions(obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}")
target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus procstat)
target_link_libraries(obs-studio PRIVATE Qt::DBus procstat)
if(Qt6_VERSION AND Qt6_VERSION VERSION_LESS "6.9.0")
target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate)
endif()
find_package(Libpci REQUIRED)
target_link_libraries(obs-studio PRIVATE Libpci::pci)
frontend/cmake/os-linux.cmake
+5 -1
View File
@@ -10,7 +10,11 @@ target_compile_definitions(
obs-studio
PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}" $<$<BOOL:${ENABLE_PORTABLE_CONFIG}>:ENABLE_PORTABLE_CONFIG>
)
target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus)
target_link_libraries(obs-studio PRIVATE Qt::DBus)
if(Qt6_VERSION AND Qt6_VERSION VERSION_LESS "6.9.0")
target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate)
endif()
find_package(Libpci REQUIRED)
target_link_libraries(obs-studio PRIVATE Libpci::pci)
frontend/plugins/aja-output-ui/CMakeLists.txt
-3
View File
@@ -10,8 +10,6 @@ find_package(LibAJANTV2 REQUIRED)
find_package(Qt6 REQUIRED Widgets)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
find_package(X11 REQUIRED)
endif()
@@ -47,7 +45,6 @@ target_link_libraries(
Qt::Widgets
AJA::LibAJANTV2
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>
)
target_link_options(aja-output-ui PRIVATE $<$<PLATFORM_ID:Windows>:/IGNORE:4099>)
frontend/plugins/decklink-output-ui/CMakeLists.txt
-3
View File
@@ -8,8 +8,6 @@ endif()
find_package(Qt6 REQUIRED Widgets)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
find_package(X11 REQUIRED)
endif()
@@ -38,7 +36,6 @@ target_link_libraries(
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>>"
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>
)
if(OS_WINDOWS)
frontend/plugins/frontend-tools/CMakeLists.txt
-2
View File
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.28...3.30)
find_package(Qt6 REQUIRED Widgets)
if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD)
find_package(Qt6 REQUIRED Gui)
find_package(X11 REQUIRED)
endif()
@@ -65,7 +64,6 @@ target_link_libraries(
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa>>"
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>
)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")