Merge branch 'macos-build-fixes'

Author: mnutt

Source/WebCore/PlatformQt.cmake

@@ -250,6 +250,9 @@ if (ENABLE_DEVICE_ORIENTATION)
         platform/qt/DeviceOrientationClientQt.cpp
         platform/qt/DeviceOrientationProviderQt.cpp
     )
+    list(APPEND WebCore_LIBRARIES
+        Qt6::Sensors
+    )
 endif ()
 
 if (ENABLE_GRAPHICS_CONTEXT_3D)
@@ -302,10 +305,11 @@ list(APPEND WebCore_LIBRARIES
     ${HYPHEN_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${LIBXSLT_LIBRARIES}
-    ${Qt6Core_LIBRARIES}
-    ${Qt6Gui_LIBRARIES}
-    ${Qt6Network_LIBRARIES}
-    ${Qt6Sensors_LIBRARIES}
+    Qt6::Core
+    Qt6::Gui
+    Qt6::GuiPrivate
+    Qt6::Network
+    Qt6::NetworkPrivate
     ${SQLITE_LIBRARIES}
     ${X11_X11_LIB}
     ${ZLIB_LIBRARIES}
@@ -399,7 +403,7 @@ if (USE_QT_MULTIMEDIA)
         platform/graphics/qt/MediaPlayerPrivateQt.cpp
     )
     list(APPEND WebCore_LIBRARIES
-        ${Qt6Multimedia_LIBRARIES}
+        Qt6::Multimedia
     )
     QTWEBKIT_GENERATE_MOC_FILES_H(WebCore platform/graphics/qt/MediaPlayerPrivateQt.h)
 endif ()

Source/WebCore/platform/AudioEncoder.cpp

@@ -51,7 +51,7 @@ Ref<AudioEncoder::CreatePromise> AudioEncoder::create(const String& codecName, c
     UNUSED_PARAM(descriptionCallback);
     UNUSED_PARAM(outputCallback);
 
-    return CreatePromise::createAndReject("Not supported"_s));
+    return CreatePromise::createAndReject("Not supported"_s);
 #endif
 }
 

Source/cmake/OptionsQt.cmake

@@ -71,26 +71,32 @@ macro(CONVERT_PRL_LIBS_TO_CMAKE _qt_component)
 endmacro()
 
 macro(CHECK_Qt6_PRIVATE_INCLUDE_DIRS _qt_component _header)
+    # Qt6 provides private headers via Qt6::${_qt_component}Private target
+    find_package(Qt6${_qt_component}Private QUIET CONFIG)
+
+    if (NOT TARGET Qt6::${_qt_component}Private)
+        message(FATAL_ERROR "Qt6::${_qt_component}Private target not found. Please make sure Qt6 private headers are installed.")
+    endif()
+
     set(INCLUDE_TEST_SOURCE
     "
         #include <${_header}>
         int main() { return 0; }
     "
     )
-    set(CMAKE_REQUIRED_INCLUDES ${Qt6${_qt_component}_PRIVATE_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LIBRARIES Qt6::${_qt_component})
 
-    # Avoid check_include_file_cxx() because it performs linking but doesn't support CMAKE_REQUIRED_LIBRARIES (doh!)
+    # Use the Private target directly - it provides the include dirs automatically
+    set(CMAKE_REQUIRED_LIBRARIES Qt6::${_qt_component} Qt6::${_qt_component}Private)
+
     check_cxx_source_compiles("${INCLUDE_TEST_SOURCE}" Qt6${_qt_component}_PRIVATE_HEADER_FOUND)
 
     unset(INCLUDE_TEST_SOURCE)
-    unset(CMAKE_REQUIRED_INCLUDES)
     unset(CMAKE_REQUIRED_LIBRARIES)
 
     if (NOT Qt6${_qt_component}_PRIVATE_HEADER_FOUND)
         message(FATAL_ERROR "Header ${_header} is not found. Please make sure that:
     1. Private headers of Qt6${_qt_component} are installed
-    2. Qt6${_qt_component}_PRIVATE_INCLUDE_DIRS is correctly defined in Qt6${_qt_component}Config.cmake")
+    2. Qt6${_qt_component}Private package is available")
     endif ()
 endmacro()
 
@@ -208,7 +214,6 @@ WEBKIT_OPTION_BEGIN()
 if (APPLE)
     set(MACOS_COMPATIBILITY_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" CACHE STRING "Compatibility version that macOS dylibs should have")
 
-    option(MACOS_FORCE_SYSTEM_XML_LIBRARIES "Use system installation of libxml2 and libxslt on macOS" ON)
     option(MACOS_USE_SYSTEM_ICU "Use system installation of ICU on macOS" ON)
     option(USE_UNIX_DOMAIN_SOCKETS "Use Unix domain sockets instead of native IPC code on macOS" OFF)
     option(USE_APPSTORE_COMPLIANT_CODE "Avoid using private macOS APIs which are not allowed on App Store (experimental)" OFF)
@@ -449,6 +454,12 @@ if (APPLE)
     endif ()
 endif ()
 
+# Prefer Homebrew libxml2/libxslt over CommandLineTools version on macOS
+# Otherwise, CommandLineTools headers get pulled in and cause conflicts
+if (APPLE AND EXISTS "/opt/homebrew/opt/libxml2/lib/pkgconfig")
+    set(ENV{PKG_CONFIG_PATH} "/opt/homebrew/opt/libxml2/lib/pkgconfig:/opt/homebrew/opt/libxslt/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+endif ()
+
 find_package(LibXml2 2.8.0 REQUIRED)
 if (ENABLE_XSLT)
     find_package(LibXslt 1.1.13 REQUIRED)

Tools/QtTestBrowser/CMakeLists.txt

@@ -43,34 +43,37 @@ set(QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES
 )
 
 set(QtTestBrowser_LIBRARIES
-    ${Qt6Gui_LIBRARIES}
-    ${Qt6Network_LIBRARIES}
-    ${Qt6Widgets_LIBRARIES}
-    ${Qt6PrintSupport_LIBRARIES}
-    ${Qt6OpenGLWidgets_LIBRARIES}
-    ${Qt6StateMachine_LIBRARIES}
+    Qt6::Gui
+    Qt6::GuiPrivate
+    Qt6::Network
+    Qt6::Widgets
     WebKitWidgets
     ${STATIC_LIB_DEPENDENCIES}
 )
 
+if (TARGET Qt6::PrintSupport)
+    list(APPEND QtTestBrowser_LIBRARIES Qt6::PrintSupport)
+endif ()
+
 qt_add_resources(QtTestBrowser_SOURCES
     QtTestBrowser.qrc
 )
 
-if (Qt6OpenGL_FOUND)
-    list(APPEND QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES
-        ${Qt6OpenGL_INCLUDE_DIRS}
-    )
-    list(APPEND QtTestBrowser_LIBRARIES
-        ${Qt6OpenGL_LIBRARIES}
-    )
+if (TARGET Qt6::OpenGL)
+    list(APPEND QtTestBrowser_LIBRARIES Qt6::OpenGL)
+endif ()
+
+if (TARGET Qt6::OpenGLWidgets)
+    list(APPEND QtTestBrowser_LIBRARIES Qt6::OpenGLWidgets)
 endif ()
 
 if (ENABLE_TEST_SUPPORT)
     add_definitions(-DHAVE_QTTESTSUPPORT)
 endif ()
 
-if (NOT TARGET Qt6::StateMachine)
+if (TARGET Qt6::StateMachine)
+    list(APPEND QtTestBrowser_LIBRARIES Qt6::StateMachine)
+else ()
     add_definitions(-DQT_NO_ANIMATION)
 endif ()