From 8a017951aa81069ea3ea9140c5b13ca7834e9363 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 10 Oct 2025 22:33:15 +0200 Subject: [PATCH] [qt_common] fix building with Qt 6.10 (#2713) Qt old style include variables are deprecated in Qt, see , and Qt 6.10 stopped exporting them after . Signed-off-by: Marcin Serwin Co-authored-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2713 Co-authored-by: Marcin Serwin Co-committed-by: Marcin Serwin --- src/qt_common/CMakeLists.txt | 8 ++++++-- src/yuzu/CMakeLists.txt | 8 -------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index aa931f113e..9b3a8fdb8d 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -45,6 +45,10 @@ if (NOT APPLE AND ENABLE_OPENGL) target_compile_definitions(qt_common PUBLIC HAS_OPENGL) endif() -if (NOT WIN32) - target_include_directories(qt_common PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) +if (UNIX AND NOT APPLE) + if (TARGET Qt6::GuiPrivate) + target_link_libraries(qt_common PRIVATE Qt6::GuiPrivate) + else() + target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) + endif() endif() diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index c03f7a3abf..a8e3953716 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -393,16 +393,8 @@ target_link_libraries(yuzu PRIVATE common core input_common frontend_common netw target_link_libraries(yuzu PRIVATE Boost::headers glad Qt6::Widgets) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) -if (NOT WIN32) - target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) -endif() - if (UNIX AND NOT APPLE) target_link_libraries(yuzu PRIVATE Qt6::DBus) - - if (TARGET Qt6::GuiPrivate) - target_link_libraries(yuzu PRIVATE Qt6::GuiPrivate) - endif() endif() target_compile_definitions(yuzu PRIVATE