diff --git a/Source/WebCore/PlatformQt.cmake b/Source/WebCore/PlatformQt.cmake index e787b33c375aa..59599cbfbbe1f 100644 --- a/Source/WebCore/PlatformQt.cmake +++ b/Source/WebCore/PlatformQt.cmake @@ -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} diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index e6bb8e240f4e5..c1f30b3774f38 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -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) diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt index 4e670650ccaf0..c93ba1410cd90 100644 --- a/Tools/QtTestBrowser/CMakeLists.txt +++ b/Tools/QtTestBrowser/CMakeLists.txt @@ -53,6 +53,13 @@ set(QtTestBrowser_LIBRARIES ${STATIC_LIB_DEPENDENCIES} ) +if (Qt6Core_VERSION VERSION_GREATER_EQUAL 6.10) + list(APPEND QtTestBrowser_PRIVATE_LIBRARIES Qt6::CorePrivate) +endif () +if (Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.10) + list(APPEND QtTestBrowser_PRIVATE_LIBRARIES Qt6::GuiPrivate) +endif () + qt_add_resources(QtTestBrowser_SOURCES QtTestBrowser.qrc )