[qt] Update to 6.10.3#51542
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the vcpkg Qt 6 port set to 6.10.3, refreshes the versions database/baselines accordingly, and replaces a couple of Apple-specific patches with upstream CMake configuration toggles. It also adjusts the Qt port update helper to emit LF line endings in generated files.
Changes:
- Bump Qt module ports (manifests + source URLs/hashes) and versions database entries from 6.10.2 → 6.10.3, and update
versions/baseline.json. qtbase: dropframework.patch/xcodebuild-not-installed.patch, addQTBUG-145239.patch, and passQT_NO_XCODE_MIN_VERSION_CHECK+QT_FIND_APPLE_SYSTEM_FRAMEWORKS_MODE.qtmultimedia/qtwebengine: remove/rename patches that appear to be superseded by 6.10.3.
Reviewed changes
Copilot reviewed 148 out of 148 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| versions/baseline.json | Update baselines for Qt ports to 6.10.3 (and reset port-versions where version bumped). |
| versions/q-/qt.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qt3d.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qt5compat.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtactiveqt.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtapplicationmanager.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtbase.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtcharts.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtcoap.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtconnectivity.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtdatavis3d.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtdeclarative.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtdeviceutilities.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtdoc.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtgraphs.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtgrpc.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qthttpserver.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtimageformats.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtinterfaceframework.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtlanguageserver.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtlocation.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtlottie.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtmqtt.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtmultimedia.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtnetworkauth.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtopcua.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtpositioning.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtquick3d.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtquick3dphysics.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtquickeffectmaker.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtquicktimeline.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtremoteobjects.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtscxml.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtsensors.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtserialbus.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtserialport.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtshadertools.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtspeech.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtsvg.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qttools.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qttranslations.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtvirtualkeyboard.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtwayland.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtwebchannel.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtwebengine.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtwebsockets.json | Add 6.10.3 entry (git-tree). |
| versions/q-/qtwebview.json | Add 6.10.3 entry (git-tree). |
| ports/qt/vcpkg.json | Bump port version to 6.10.3. |
| ports/qt3d/vcpkg.json | Bump port version to 6.10.3. |
| ports/qt3d/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qt5compat/vcpkg.json | Bump port version to 6.10.3. |
| ports/qt5compat/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtactiveqt/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtactiveqt/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtapplicationmanager/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtapplicationmanager/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtbase/vcpkg.json | Bump port version to 6.10.3 (drop port-version field). |
| ports/qtbase/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtbase/portfile.cmake | Replace Apple patches with CMake options; add QTBUG-145239 patch. |
| ports/qtbase/QTBUG-145239.patch | New patch to fix compilation with macOS 26.4 SDK. |
| ports/qtbase/xcodebuild-not-installed.patch | Remove patch (superseded by QT_NO_XCODE_MIN_VERSION_CHECK). |
| ports/qtbase/framework.patch | Remove patch (superseded by QT_FIND_APPLE_SYSTEM_FRAMEWORKS_MODE). |
| ports/qtbase/cmake/qt_port_details.cmake | Update helper to 6.10.3 and attempt to force LF in generated files. |
| ports/qtcharts/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtcharts/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtcoap/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtcoap/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtconnectivity/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtconnectivity/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtdatavis3d/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtdatavis3d/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtdeclarative/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtdeclarative/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtdeviceutilities/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtdeviceutilities/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtdoc/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtdoc/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtgraphs/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtgraphs/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtgrpc/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtgrpc/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qthttpserver/vcpkg.json | Bump port version to 6.10.3. |
| ports/qthttpserver/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtimageformats/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtimageformats/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtinterfaceframework/vcpkg.json | Bump port version to 6.10.3 (drop port-version field). |
| ports/qtinterfaceframework/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtlanguageserver/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtlanguageserver/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtlocation/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtlocation/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtlottie/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtlottie/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtmqtt/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtmqtt/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtmultimedia/vcpkg.json | Bump port version to 6.10.3 (drop port-version field). |
| ports/qtmultimedia/portfile.cmake | Update patch set used for the new version. |
| ports/qtmultimedia/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtmultimedia/ffmpeg-devendor-signalsmith-stretch.patch | Adjust patch content for the new qtmultimedia layout/version. |
| ports/qtmultimedia/ae41d3e-ffmpeg8.diff | Remove patch (no longer applied). |
| ports/qtnetworkauth/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtnetworkauth/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtopcua/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtopcua/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtpositioning/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtpositioning/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtquick3d/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtquick3d/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtquick3dphysics/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtquick3dphysics/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtquickeffectmaker/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtquickeffectmaker/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtquicktimeline/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtquicktimeline/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtremoteobjects/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtremoteobjects/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtscxml/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtscxml/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtsensors/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtsensors/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtserialbus/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtserialbus/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtserialport/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtserialport/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtshadertools/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtshadertools/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtspeech/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtspeech/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtsvg/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtsvg/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qttools/vcpkg.json | Bump port version to 6.10.3. |
| ports/qttools/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qttranslations/vcpkg.json | Bump port version to 6.10.3. |
| ports/qttranslations/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtvirtualkeyboard/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtvirtualkeyboard/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtwayland/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtwayland/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtwebchannel/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtwebchannel/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtwebengine/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtwebengine/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtwebengine/portfile.cmake | Drop allow-msvc-145.diff from patch list. |
| ports/qtwebengine/allow-msvc-145.diff | Remove patch (no longer applied). |
| ports/qtwebsockets/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtwebsockets/port.data.cmake | Update source URLs/hashes for 6.10.3. |
| ports/qtwebview/vcpkg.json | Bump port version to 6.10.3. |
| ports/qtwebview/port.data.cmake | Update source URLs/hashes for 6.10.3. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| -DFEATURE_force_debug_info:BOOL=ON | ||
| -DFEATURE_relocatable:BOOL=ON | ||
| -DQT_AUTODETECT_ANDROID:BOOL=ON # Use vcpkg toolchain as is | ||
| -DQT_NO_XCODE_MIN_VERSION_CHECK:BOOL=ON # The cmd line tools are missing xcodebuild |
There was a problem hiding this comment.
FWIW we explicitly started including xcodebuild in the build lab just for things doing stuff like this so that should work at least in theory.
BillyONeal
left a comment
There was a problem hiding this comment.
Thanks! (Note that GitHub thinks things are "red" but they're actually not, Azure DevOps just hasn't gotten the memo over to GitHub that the build is still running for some reason)
I was a bit impatient and hit "ready for review" before x64_windows has finished and apparently it's enough to restart actions. The status for x64_windows check got stuck after this. |
They changed something about webhooks. It's still running at https://dev.azure.com/vcpkg/public/_build/results?buildId=131238&view=results |
Fixes #51053.
Alternative to #51240.
framework.patch- replaced withQT_FIND_APPLE_SYSTEM_FRAMEWORKS_MODE=ONLYxcodebuild-not-installed.patch- replaced withQT_NO_XCODE_MIN_VERSION_CHECK=ONDrive-by: force LF line endings in generated files.