Mirror/eden
1
0 Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-10-01 14:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[qt_common] fix building with Qt 6.10 (#2713)

Browse Source 
Qt old style include variables are deprecated in Qt, see <https://github.com/qt/qtbase/blob/v6.10.0/cmake/QtModuleConfig.cmake.in#L84>, and Qt 6.10 stopped exporting them after <https://github.com/qt/qtbase/commit/ad7b94e163ac5c3959a7e38d7f48536be288a187>.

Signed-off-by: Marcin Serwin <[email protected]>

Co-authored-by: crueter <[email protected]>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2713
Co-authored-by: Marcin Serwin <[email protected]>
Co-committed-by: Marcin Serwin <[email protected]>
This commit is contained in:
Marcin Serwinandcrueter authored and crueter committed 2025-10-10 22:33:15 +02:00
1 parent 776958c79d
commit 8a017951aa
2 files changed
+6 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/qt_common/CMakeLists.txt
+6 -2
View File
@@ -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()
src/yuzu/CMakeLists.txt
-8
View File
@@ -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