Add Qt 6 support (dual Qt 5 / Qt 6 build) - #1335

Open

drnic wants to merge 18 commits into

ArduPilot:masterfrom

drnic:qt6-support

Commits on Jun 30, 2026

Support building on Qt6 while keeping Qt5 (dual build)
drnic
committed
cdd00fb
Fix Qt6 startup hang from singleton re-entrancy during MainWindow construction
drnic
committed
da74506
Show Qt major version in window title
drnic
committed
90e0755
Fix Qt6 toolbar icons and phantom map scrollbar
drnic
committed
ea2c9ff
Fix Qt6 tofu boxes in STATUSTEXT messages
drnic
committed
2d7ca54
Rewrite BarGauge QML without Qt5-only Controls 1.x
drnic
committed
b6e2e90
Remove QtMultimedia dependency on macOS
drnic
committed
36ab453
Replace removed Q_OS_MACX with Q_OS_MACOS for Qt6
drnic
committed
840914f
Port CameraView from QGLWidget to QOpenGLWidget for Qt6
drnic
committed
07533ea
Update qmake, packaging and CI for Qt6 dual build
drnic
committed
a92e613
README: Replace outdated Windows build steps with CMake/Ninja (Qt5/Qt6)
drnic
committed
0505193
README: Auto-detect Qt kit in Windows build instead of hardcoding version
drnic
committed
d1b000b
CI: Build universal (arm64 + x86_64) macOS Qt6 DMG
drnic
committed
60493d3

Commits on Jul 1, 2026

qcustomplot: Present QCP as plain namespace under all Qt6 moc
drnic
committed
9a0f2a8
CI: Fix Qt5 module list and disable macos-13 leg temporarily
drnic
committed
83ab34d
main: Guard Qt::AA_X11InitThreads for Qt5 only
drnic
committed
8766659
CMake: Strip legacy AGL framework from Qt link interface on macOS
drnic
committed
044cab7
CI: Bump to Node 24 actions and move Qt5 macOS leg to macos-latest
drnic
committed
0597bb7