Skip to content

Bump to 6.10.1 minimum#14366

Draft
Ryanf55 wants to merge 1 commit into
mavlink:masterfrom
ThinkOrbital:bumpt-6.10.1
Draft

Bump to 6.10.1 minimum#14366
Ryanf55 wants to merge 1 commit into
mavlink:masterfrom
ThinkOrbital:bumpt-6.10.1

Conversation

@Ryanf55
Copy link
Copy Markdown
Contributor

@Ryanf55 Ryanf55 commented May 12, 2026

Description

  • 6.10.0 does not compile anymore due to ABI breaks in QVideoTextureHelper (private header).
  • QGC documentations says only to use 6.10.1, so let's fail at configure time if you have 6.10.0, which used to be recommended.

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation update
  • Refactoring (no functional changes)
  • CI/Build changes
  • Other

Testing

  • Tested locally
  • Added/updated unit tests
  • Tested with simulator (SITL)
  • Tested with hardware

Platforms Tested

  • Linux
  • Windows
  • macOS
  • Android
  • iOS

Flight Stacks Tested

  • PX4
  • ArduPilot

Screenshots

Checklist

  • I have read the Contribution Guidelines
  • I have read the Code of Conduct
  • My code follows the project's coding standards
  • I have added tests that prove my fix/feature works
  • New and existing unit tests pass locally

Related Issues


By submitting this pull request, I confirm that my contribution is made under the terms of the project's dual license (Apache 2.0 and GPL v3).

* 6.10.0 does not compile anymore due to ABI breaks  in QVideoTextureHelper

Signed-off-by: Ryan Friedman <25047695+Ryanf55@users.noreply.github.com>
@Ryanf55 Ryanf55 requested a review from HTRamsey as a code owner May 12, 2026 17:34

# TODO: Remove qt_version override once aqtinstall supports Qt 6.10.1+ for cross-compiled ARM64
# Workaround: Pin to Qt 6.10.0 until aqtinstall fix is released
# Tracking: https://github.com/miurahr/aqtinstall/pull/952
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now merged.

@github-actions github-actions Bot added github_actions Pull requests that update GitHub Actions code size/XS labels May 12, 2026
@Ryanf55 Ryanf55 marked this pull request as draft May 12, 2026 17:46
@Ryanf55
Copy link
Copy Markdown
Contributor Author

Ryanf55 commented May 12, 2026

Windows build is broken by this.
https://github.com/mavlink/qgroundcontrol/actions/runs/25751338836/job/75628213712?pr=14366#step:5:802

Not sure on fix yet, suggestions welcome.

@HTRamsey
Copy link
Copy Markdown
Collaborator

Windows build is broken by this. mavlink/qgroundcontrol/actions/runs/25751338836/job/75628213712?pr=14366#step:5:802

Not sure on fix yet, suggestions welcome.

Problem is this hasn't been included in a release yet (miurahr/aqtinstall#952). I think we could build from a commit on their master branch though if we wanted to

@HTRamsey
Copy link
Copy Markdown
Collaborator

aqtsource: |- # Use aqtinstall HEAD when cross-compiling for ARM64 with Qt 6.10.x
            ${{
              ( startsWith(matrix.qt, '6.10.') && matrix.arch == 'arm64' && matrix.os != '11-arm' &&
                'git+https://github.com/miurahr/aqtinstall.git' ) ||
              ( startsWith(matrix.qt, '6.11.') && matrix.os != '11-arm' &&
                'git+https://github.com/miurahr/aqtinstall.git@refs/pull/1000/head' )
              || ''
            }}

@codecov
Copy link
Copy Markdown

codecov Bot commented May 12, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (master@b59e589). Learn more about missing BASE report.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #14366   +/-   ##
=========================================
  Coverage          ?   25.47%           
=========================================
  Files             ?      769           
  Lines             ?    65911           
  Branches          ?    30495           
=========================================
  Hits              ?    16791           
  Misses            ?    37281           
  Partials          ?    11839           
Flag Coverage Δ
unittests 25.47% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b59e589...2060559. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link
Copy Markdown
Contributor

Build Results

Platform Status

Platform Status Details
Linux Passed View
Windows Failed View
MacOS Passed View
Android Passed View

Some builds failed.

Pre-commit

Check Status Details
pre-commit Failed (non-blocking) View

Pre-commit hooks: 4 passed, 45 failed, 7 skipped.

Test Results

linux-coverage: 90 passed, 0 skipped
Total: 90 passed, 0 skipped

Code Coverage

Coverage Baseline Change
59.3% 59.2% +0.1%

Artifact Sizes

Artifact Size Δ from master
QGroundControl 216.86 MB -4.63 MB (decrease)
QGroundControl-aarch64 176.77 MB -0.00 MB (decrease)
QGroundControl-linux 335.18 MB +0.03 MB (increase)
QGroundControl-mac 187.14 MB +0.02 MB (increase)
QGroundControl-windows 187.15 MB +0.02 MB (increase)
QGroundControl-x86_64 171.96 MB -0.45 MB (decrease)
Total size decreased by 5.02 MB

Updated: 2026-05-12 18:23:14 UTC • Triggered by: Android

@DonLakeFlyer
Copy link
Copy Markdown
Collaborator

@HTRamsey Is there a reason we won't lock down to a specific Qt version? To me not doing that just gives us possible support problems like this. The version we build with in CI is the only one that matters. Anything else is unverified.

@HTRamsey
Copy link
Copy Markdown
Collaborator

My plan was to raise the minimum for the release. It was kinda annoying raising the minimum on daily and having different branches on different versions and having to rebase all of them. But we can do it now too, doesn't matter that much

@DonLakeFlyer
Copy link
Copy Markdown
Collaborator

Not quite sure what the problem is you are describing but as I've said before anything other than specific lockdown only causes support problems given my experience. I think it should always be locked down to a specific version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code size/XS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants