Skip to content

Qt: Update to 6.8.2 #12433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Qt: Update to 6.8.2 #12433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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.8.1
default: 6.8.2
abis:
description: ABIs to Build
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

env:
ARTIFACT: QGroundControl-installer.exe
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
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.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
env:
ARTIFACT: QGroundControl-x86_64.AppImage
PACKAGE: QGroundControl-x86_64
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
env:
ARTIFACT: QGroundControl.dmg
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl-installer.exe
PACKAGE: QGroundControl-installer
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/Dockerfile-build-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM sickcodes/docker-osx:latest

# Set environment variables
ENV QT_VERSION=6.8.1
ENV QT_VERSION=6.8.2
ENV QT_PATH=/opt/Qt
ENV QT_DESKTOP=$QT_PATH/${QT_VERSION}/clang_64

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/Dockerfile-build-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04

ARG QT_VERSION=6.8.1
ARG QT_VERSION=6.8.2
ARG QT_MODULES="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"

ENV DEBIAN_FRONTEND noninteractive
Expand Down
2 changes: 1 addition & 1 deletion deploy/linux/appimagecraft.yml
View file
Open in desktop
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.8.1/gcc_64
- Qt6_ROOT=/home/runner/work/_temp/Qt/6.8.2/gcc_64
environment:
BUILD_TYPE: Release

Expand Down
8 changes: 4 additions & 4 deletions deploy/vagrant/.vagrantconfig.yml
View file
Open in desktop
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.8.1/gcc_64/bin'
'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.8.1/gcc_64/lib'
'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.8.1/gcc_64/plugins'
'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.8.1/gcc_64/qml'
'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/6.8.2/gcc_64/bin'
'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.8.2/gcc_64/lib'
'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.8.2/gcc_64/plugins'
'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.8.2/gcc_64/qml'

'project_root_dir': '/vagrant'

Expand Down
2 changes: 1 addition & 1 deletion docs/en/qgc-dev-guide/getting_started/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
qt_version: 6.8.1
qt_version: 6.8.2
---

# Getting Started with Source and Builds
Expand Down
2 changes: 1 addition & 1 deletion tools/setup/install-qt-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

QT_VERSION="${QT_VERSION:-6.8.1}"
QT_VERSION="${QT_VERSION:-6.8.2}"
QT_PATH="${QT_PATH:-/opt/Qt}"
QT_HOST="${QT_HOST:-linux}"
QT_TARGET="${QT_TARGET:-desktop}"
Expand Down
2 changes: 1 addition & 1 deletion translations/qgc-lupdate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This script will update both the Qt and Json string translation files.
QT_PATH=~/Qt/6.8.1/*/bin
QT_PATH=~/Qt/6.8.2/*/bin
$QT_PATH/lupdate ../src -ts qgc.ts -no-obsolete
python3 qgc-lupdate-json.py
Loading