build: update to Qt 6.11.1#14552
Conversation
There was a problem hiding this comment.
Pull request overview
Updates QGroundControl’s Qt baseline to the Qt 6.11 line (target 6.11.1, minimum 6.11.0) and aligns related build/runtime expectations (iOS deployment target and GStreamer ↔ Qt color-transfer mapping) so CI and multimedia behavior match upstream Qt 6.11.
Changes:
- Bumped Qt target/minimum versions and updated the project’s “disable deprecated / strict mode” cutoffs to 0x060B00.
- Raised the iOS deployment target to 17.0 to match Qt 6.11’s minimum supported iOS version (including the iOS CMake preset).
- Synced GStreamer color-transfer mapping/tests to Qt 6.11.1 behavior (SMPTE240M and GAMMA18 adjustments) and refreshed related comments.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
.github/build-config.json |
Updates Qt target/min versions and iOS deployment target used by CI/tooling. |
cmake/presets/iOS.json |
Raises iOS deployment target in the iOS CMake preset to 17.0. |
cmake/CustomOptions.cmake |
Updates Qt deprecation/strict-mode cutoff hex values to Qt 6.11 (0x060B00). |
cmake/install/Install.cmake |
Refreshes Wayland plugin comment while keeping deployment plugin inclusion intact. |
src/VideoManager/VideoReceiver/GStreamer/GstAppSinkAdapter.cc |
Adjusts GStreamer→Qt transfer-function mapping to match Qt 6.11.1’s backend mapping. |
src/VideoManager/VideoReceiver/GStreamer/gstqgc/gstqgcvideosinkbin.cc |
Updates Y444/Qt version comment in caps documentation. |
test/VideoManager/GStreamer/GStreamerTest.cc |
Updates/extends unit tests for the revised transfer-function mapping and comment refresh. |
1de79c2 to
ac5f389
Compare
ac5f389 to
0792c05
Compare
0792c05 to
8d0a99b
Compare
8d0a99b to
bf22eea
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #14552 +/- ##
==========================================
+ Coverage 25.47% 30.24% +4.77%
==========================================
Files 769 772 +3
Lines 65912 67022 +1110
Branches 30495 31135 +640
==========================================
+ Hits 16788 20270 +3482
+ Misses 37285 32970 -4315
- Partials 11839 13782 +1943
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 377 files with indirect coverage changes Continue to review full report in Codecov by Harness.
🚀 New features to boost your workflow:
|
bf22eea to
794c1d7
Compare
Bump Qt target 6.10.3 -> 6.11.1 and minimum 6.10.0 -> 6.11.0. - ios_deployment_target 14.0 -> 17.0: Qt 6.11 minimum supported iOS is 17 (QT_SUPPORTED_MIN_IOS_VERSION). macOS stays 13, matching Qt's minimum. - QGC_QT_DISABLE_DEPRECATED_UP_TO / ENABLE_STRICT_MODE_UP_TO 0x060A00 -> 0x060B00 to track the new floor. - Sync GStreamer color-transfer map to Qt 6.11.1 QGstCaps::formatAndVideoInfo: SMPTE240M now maps to Gamma22, GAMMA18 to BT709 (were swapped); update the unit test accordingly and add the missing GAMMA18 case. - Refresh Qt-version references in comments (Y444 omission, wayland plugin). Network helper follow-ons for the 6.11 floor: - QGCNetworkHelper: add per-request TCP keep-alive + ConnectionCacheExpiry RequestConfig fields and apply them in configureRequest; wire them into QGeoTileFetcherQGC tile/terrain requests to keep sockets warm against Qt 6.11's new 2-min idle-connection reaping. - Reuse Qt facilities: classifyHttpStatus compares via QHttpServerResponder StatusCode; URL helpers use QUrl::adjusted; header setters use QHttpHeaders::WellKnownHeader; drop hand-rolled urlFileName for QUrl::fileName. - Cover the new keep-alive fields in QGCNetworkHelperTest.
794c1d7 to
75c29be
Compare
Summary
Updates the Qt target to 6.11.1 and the supported minimum to 6.11.0.
Changes
qt_version6.10.3 → 6.11.1,qt_minimum_version6.10.0 → 6.11.0 (.github/build-config.json).QT_SUPPORTED_MIN_IOS_VERSIONin Qt's.cmake.conf); 14.0 is no longer functional. macOS stays 13.0, matching Qt's minimum. Updated bothbuild-config.jsonand thecmake/presets/iOS.jsonpreset.QGC_QT_DISABLE_DEPRECATED_UP_TO/QGC_QT_ENABLE_STRICT_MODE_UP_TO0x060A00→0x060B00to track the new floor.QGstCaps::formatAndVideoInfo():SMPTE240M→Gamma22andGAMMA18→BT709(previously swapped relative to Qt). Updated the unit test and added the missingGAMMA18assertion.Verification
QVideoFrameFormat::PixelFormatstill has noFormat_YUV444*in 6.11.1, so the Y444 omission remains correct.