diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index d7131a3b35..686cd22cff 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -109,19 +109,17 @@ disable_compiler_warnings_for_target(speex) # Find the Qt components that we need. if(ENABLE_QT_UI) find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) +endif() - if(WIN32) - add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL) - endif() +if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0) + find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED) +endif() - # The docking system for the debugger. - find_package(KDDockWidgets-qt6 2.0.0 REQUIRED) - # Add an extra include path to work around a broken include directive. - # TODO: Remove this the next time we update KDDockWidgets. - get_target_property(KDDOCKWIDGETS_INCLUDE_DIRECTORY KDAB::kddockwidgets INTERFACE_INCLUDE_DIRECTORIES) - target_include_directories(KDAB::kddockwidgets INTERFACE - ${KDDOCKWIDGETS_INCLUDE_DIRECTORY}/kddockwidgets - ) +# The docking system for the debugger. + find_package(KDDockWidgets-qt6 2.3.0 REQUIRED) + +if(WIN32) + add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL) endif() # Demangler for the debugger. diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt index 8e068aba76..ff823e36b9 100644 --- a/pcsx2-qt/CMakeLists.txt +++ b/pcsx2-qt/CMakeLists.txt @@ -281,6 +281,7 @@ target_link_libraries(pcsx2-qt PRIVATE PCSX2 Qt6::Core Qt6::Gui + Qt6::GuiPrivate Qt6::Widgets KDAB::kddockwidgets )