80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4736 from jgilje/qt_private_header_for_qt6

Browse Source 
qt_private_headers are needed for both qt5 and qt6
This commit is contained in:
Miran Grča
2024-08-21 20:25:12 +02:00
committed by GitHub
parent e858a4344c 98eed0b85d
commit d0a354da9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/CMakeLists.txt
View File

@@ -408,7 +408,7 @@ if (UNIX AND NOT APPLE AND NOT HAIKU)
target_compile_definitions(ui PRIVATE XKBCOMMON_X11)
target_link_libraries(ui PRIVATE X11::xcb PUBLIC PkgConfig::XKBCOMMON_X11)
target_sources(ui PRIVATE xkbcommon_x11_keyboard.cpp)
set(QT5_PRIVATE_HEADERS ON)
set(QT_PRIVATE_HEADERS ON)
endif()
endif()
endif()
@@ -430,13 +430,13 @@ if (UNIX AND NOT APPLE AND NOT HAIKU)
target_sources(ui PRIVATE xkbcommon_wl_keyboard.cpp)
endif()
target_compile_definitions(ui PRIVATE WAYLAND)
set(QT5_PRIVATE_HEADERS ON)
set(QT_PRIVATE_HEADERS ON)
endif()
endif()
endif()
# Add private headers for Qt5 if required.
if (NOT USE_QT6 AND DEFINED QT5_PRIVATE_HEADERS)
if (DEFINED QT_PRIVATE_HEADERS)
find_package(Qt${QT_MAJOR}Gui)
if (Qt${QT_MAJOR}Gui_FOUND)
include_directories(${Qt${QT_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})