PCSX2/archived-pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-01-31 01:15:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmake: remove Qt6::GuiPrivate dependency on WIN32 and APPLE

Browse Source
This commit is contained in:
oltolm
2025-12-06 12:50:33 +01:00
committed by Ty
parent 629a58469b
commit 4297918ce2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/SearchForStuff.cmake
View File

@@ -110,8 +110,10 @@ disable_compiler_warnings_for_target(speex)
if(ENABLE_QT_UI) if(ENABLE_QT_UI)
find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED) find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0) if(NOT WIN32 AND NOT APPLE)
find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED) if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
endif()
endif() endif()
# The docking system for the debugger. # The docking system for the debugger.

5
pcsx2-qt/CMakeLists.txt
View File

@@ -289,11 +289,14 @@ target_link_libraries(pcsx2-qt PRIVATE
PCSX2 PCSX2
Qt6::Core Qt6::Core
Qt6::Gui Qt6::Gui
Qt6::GuiPrivate
Qt6::Widgets Qt6::Widgets
KDAB::kddockwidgets KDAB::kddockwidgets
) )
if(NOT WIN32 AND NOT APPLE)
target_link_libraries(pcsx2-qt PRIVATE Qt6::GuiPrivate)
endif()
# Our Qt builds may have exceptions on, so force them off. # Our Qt builds may have exceptions on, so force them off.
target_compile_definitions(pcsx2-qt PRIVATE QT_NO_EXCEPTIONS) target_compile_definitions(pcsx2-qt PRIVATE QT_NO_EXCEPTIONS)

2
pcsx2-qt/DisplayWidget.cpp
View File

@@ -26,8 +26,6 @@
#if defined(_WIN32) #if defined(_WIN32)
#include "common/RedtapeWindows.h" #include "common/RedtapeWindows.h"
#elif !defined(APPLE)
#include <qpa/qplatformnativeinterface.h>
#endif #endif
DisplaySurface::DisplaySurface() DisplaySurface::DisplaySurface()