Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/qt-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inputs:
version:
description: Qt Version
required: false
default: 6.10.0
default: 6.10.1
abis:
description: ABIs to Build
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Ground Control Station for MAVLink-enabled UAVs supporting PX4 and ArduPilot.
**Golden Rule**: Multi-vehicle support means ALWAYS null-check `MultiVehicleManager::instance()->activeVehicle()`.

## Tech Stack
- **C++20** with **Qt 6.10.0** (QtQml, QtQuick)
- **C++20** with **Qt 6.10.1** (QtQml, QtQuick)
- **Build**: CMake 3.25+, Ninja
- **Protocol**: MAVLink 2.0
- **Platforms**: Windows, macOS, Linux, Android, iOS
Expand Down Expand Up @@ -181,7 +181,7 @@ void method(Vehicle* vehicle) {
## Build Commands
```bash
git submodule update --init --recursive
~/Qt/6.10.0/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
~/Qt/6.10.1/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
cmake --build build --config Debug
./build/Debug/QGroundControl --unittest # Run tests
```
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fail-fast: false
matrix:
build_type: [Release]
qt_version: [6.10.0]
qt_version: [6.10.1]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

env:
ARTIFACT: QGroundControl.apk
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

env:
ARTIFACT: QGroundControl.apk
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\deploy\android\android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
shell: cmd

env:
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1
GST_VERSION: 1.22.12

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
ARTIFACT: QGroundControl.app
PACKAGE: QGroundControl
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
shell: bash

env:
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Qt for Linux
uses: jurplel/install-qt-action@v4
with:
version: 6.10.0
version: 6.10.1
cache: true

- name: Update translation files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
shell: bash

env:
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
pipx ensurepath
USER_BASE_BIN="$(python3 -m site --user-base)/bin"
export PATH="$USER_BASE_BIN:$PATH"
QT_VERSION=6.10.0
QT_VERSION=6.10.1
QT_ARCH=linux_gcc_64
QT_PATH=/opt/Qt
aqt install-qt linux desktop $QT_VERSION $QT_ARCH -O $QT_PATH
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
shell: cmd

env:
QT_VERSION: 6.10.0
QT_VERSION: 6.10.1

steps:
- name: Checkout repo
Expand Down
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# QGroundControl Quick Reference for AI Assistants

**Ground Control Station** for UAVs using MAVLink protocol. **C++20/Qt 6.10.0** with QML UI.
**Ground Control Station** for UAVs using MAVLink protocol. **C++20/Qt 6.10.1** with QML UI.

## 🔑 Most Critical Architecture Pattern

Expand Down Expand Up @@ -43,7 +43,7 @@ src/

```bash
git submodule update --init --recursive
~/Qt/6.10.0/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
~/Qt/6.10.1/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
cmake --build build --config Debug
./build/Debug/QGroundControl --unittest # Run tests
```
Expand Down
2 changes: 1 addition & 1 deletion cmake/CustomOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ set(QGC_WINDOWS_RESOURCE_FILE_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundCo
# ============================================================================

set(QGC_QT_MINIMUM_VERSION "6.10.0" CACHE STRING "Minimum supported Qt version")
set(QGC_QT_MAXIMUM_VERSION "6.10.0" CACHE STRING "Maximum supported Qt version")
set(QGC_QT_MAXIMUM_VERSION "6.10.1" CACHE STRING "Maximum supported Qt version")

set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml" CACHE PATH "QML output directory")
set(QML_IMPORT_PATH "${QT_QML_OUTPUT_DIRECTORY}" CACHE STRING "Additional QML import paths")
Expand Down
4 changes: 2 additions & 2 deletions cmake/platform/Android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ endif()
# ----------------------------------------------------------------------------
# Android NDK Version Validation
# ----------------------------------------------------------------------------
if(Qt6_VERSION VERSION_EQUAL "6.10.0")
if(Qt6_VERSION VERSION_EQUAL "6.10.1")
if(NOT CMAKE_ANDROID_NDK_VERSION VERSION_EQUAL "27.2")
message(FATAL_ERROR "QGC: Invalid NDK Version: ${CMAKE_ANDROID_NDK_VERSION}. Qt 6.10.0 requires NDK 27.2")
message(FATAL_ERROR "QGC: Invalid NDK Version: ${CMAKE_ANDROID_NDK_VERSION}. Qt 6.10.1 requires NDK 27.2")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/Dockerfile-build-android
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest && \
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" "platforms;android-35" "build-tools;35.0.0" "ndk;26.1.10909125"

# Qt setup and environment variables
ENV QT_VERSION="6.10.0"
ENV QT_VERSION="6.10.1"
ENV QT_PATH="/opt/Qt"
ENV QT_HOST="linux"
ENV QT_HOST_ARCH="gcc_64"
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/Dockerfile-build-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN chmod +x /tmp/qt/*.sh && \
/tmp/qt/install-qt-debian.sh && \
rm -rf /tmp/qt # keep the image slim

ENV QT_ROOT_DIR=/opt/Qt/6.10.0/gcc_64
ENV QT_ROOT_DIR=/opt/Qt/6.10.1/gcc_64
ENV PATH=$QT_ROOT_DIR/bin:$PATH

# ---------- Git safe directory (avoids “detected dubious ownership”) ----------
Expand Down
2 changes: 1 addition & 1 deletion deploy/linux/appimagecraft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
cmake:
source_dir: src/
extra_variables:
- Qt6_ROOT=/home/runner/work/_temp/Qt/6.10.0/gcc_64
- Qt6_ROOT=/home/runner/work/_temp/Qt/6.10.1/gcc_64
environment:
BUILD_TYPE: Release

Expand Down
8 changes: 4 additions & 4 deletions deploy/vagrant/.vagrantconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ configs:
'qt_deps_unpack_parent_dir': '/home/vagrant'

'qt_deps_unpack_dir': '/home/vagrant/Qt'
'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/6.10.0/gcc_64/bin'
'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.10.0/gcc_64/lib'
'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.10.0/gcc_64/plugins'
'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.10.0/gcc_64/qml'
'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/bin'
'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/lib'
'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/plugins'
'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/qml'

'project_root_dir': '/vagrant'

Expand Down
2 changes: 1 addition & 1 deletion deploy/vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Vagrant.configure(2) do |config|
apt-get install -y patchelf

dir="%{qt_deps_unpack_dir}"
version="6.10.0"
version="6.10.1"
host="linux"
target="desktop"
modules="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml"
Expand Down
2 changes: 1 addition & 1 deletion docs/en/qgc-dev-guide/getting_started/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
qt_version: 6.10.0
qt_version: 6.10.1
---

# Getting Started with Source and Builds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ There is also a [Change Log](https://github.com/mavlink/qgroundcontrol/blob/mast
* Developer changes
* Build system fully converted to cmake
* qmake no longer supported
* Source updated to use Qt 6.10.0
* Source updated to use Qt 6.10.1
* GStreamer support updated to 1.22
2 changes: 1 addition & 1 deletion tools/setup/install-qt-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

QT_VERSION="${QT_VERSION:-6.10.0}"
QT_VERSION="${QT_VERSION:-6.10.1}"
QT_PATH="${QT_PATH:-/opt/Qt}"
QT_HOST="${QT_HOST:-linux}"
QT_TARGET="${QT_TARGET:-desktop}"
Expand Down
2 changes: 1 addition & 1 deletion tools/setup/install-qt-macos.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Set defaults appropriate for macOS.
QT_VERSION="${QT_VERSION:-6.10.0}"
QT_VERSION="${QT_VERSION:-6.10.1}"
QT_PATH="${QT_PATH:-/opt/Qt}"
QT_HOST="${QT_HOST:-mac}"
QT_TARGET="${QT_TARGET:-desktop}"
Expand Down
2 changes: 1 addition & 1 deletion tools/setup/install-qt-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# ————————————————————————————————
# 1) Defaults (env overrides supported)
# ————————————————————————————————
$QT_VERSION = $env:QT_VERSION -or '6.10.0'
$QT_VERSION = $env:QT_VERSION -or '6.10.1'
$QT_PATH = $env:QT_PATH -or 'C:\Qt'
$QT_HOST = $env:QT_HOST -or 'windows'
$QT_TARGET = $env:QT_TARGET -or 'desktop'
Expand Down
Loading