pcsx2: fix build with Qt 6.10

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2025-10-23 18:26:56 +02:00
parent 5f873d3380
commit dd207a94be
2 changed files with 28 additions and 0 deletions
@@ -0,0 +1,25 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 504b7a3..100a024 100644
+--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
+@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
+ disable_compiler_warnings_for_target(speex)
+ 
+ # Find the Qt components that we need.
+-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
+ 
+ if(WIN32)
+   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
+diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
+index a62df95..4883c64 100644
+--- a/pcsx2-qt/CMakeLists.txt
+++ b/pcsx2-qt/CMakeLists.txt
+@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
+ 	Qt6::Core
+ 	Qt6::Gui
+ 	Qt6::Widgets
+	Qt6::GuiPrivate
+ 	KDAB::kddockwidgets
+ )
+ 
@@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
    ./0000-define-rev.patch

    ./remove-cubeb-vendor.patch
+
+    # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
+    ./fix-qt-6.10.patch
  ];

  cmakeFlags = [