Skip to content

cmake: fix finding Qt private headers with Qt >=6.10 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
whitslack wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −0
Draft

cmake: fix finding Qt private headers with Qt >=6.10 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Source/WebCore/PlatformQt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,13 @@ list(APPEND WebCore_LIBRARIES
${ZLIB_LIBRARIES}
)

if (Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.10)
list(APPEND WebCore_PRIVATE_LIBRARIES Qt6::GuiPrivate)
endif ()
if (Qt6Network_VERSION VERSION_GREATER_EQUAL 6.10)
list(APPEND WebCore_PRIVATE_LIBRARIES Qt6::NetworkPrivate)
endif ()

if (QT_STATIC_BUILD)
list(APPEND WebCore_LIBRARIES
${STATIC_LIB_DEPENDENCIES}
Expand Down
5 changes: 5 additions & 0 deletions Source/cmake/OptionsQt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ macro(CHECK_Qt6_PRIVATE_INCLUDE_DIRS _qt_component _header)
set(CMAKE_REQUIRED_INCLUDES ${Qt6${_qt_component}_PRIVATE_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES Qt6::${_qt_component})

if (Qt6${_qt_component}_VERSION VERSION_GREATER_EQUAL 6.10)
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS ${_qt_component}Private)
list(APPEND CMAKE_REQUIRED_LIBRARIES Qt6::${_qt_component}Private)
endif ()

# Avoid check_include_file_cxx() because it performs linking but doesn't support CMAKE_REQUIRED_LIBRARIES (doh!)
check_cxx_source_compiles("${INCLUDE_TEST_SOURCE}" Qt6${_qt_component}_PRIVATE_HEADER_FOUND)

Expand Down