From 05087daac14644d73a59a88ea553df72401fde63 Mon Sep 17 00:00:00 2001 From: Holden Date: Wed, 12 Feb 2025 02:42:32 -0500 Subject: [PATCH] Qt: Update to 6.8.2 --- .github/actions/qt-android/action.yml | 2 +- .github/workflows/android-linux.yml | 2 +- .github/workflows/android-macos.yml | 2 +- .github/workflows/android-windows.yml | 2 +- .github/workflows/custom.yml | 2 +- .github/workflows/ios.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- deploy/docker/Dockerfile-build-macos | 2 +- deploy/docker/Dockerfile-build-ubuntu | 2 +- deploy/linux/appimagecraft.yml | 2 +- deploy/vagrant/.vagrantconfig.yml | 8 ++++---- docs/en/qgc-dev-guide/getting_started/index.md | 2 +- tools/setup/install-qt-debian.sh | 2 +- translations/qgc-lupdate.sh | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/actions/qt-android/action.yml b/.github/actions/qt-android/action.yml index efd2dfa8d6d6..3ee5810a8bc6 100644 --- a/.github/actions/qt-android/action.yml +++ b/.github/actions/qt-android/action.yml @@ -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 diff --git a/.github/workflows/android-linux.yml b/.github/workflows/android-linux.yml index d50703d2533e..37ee1360caf6 100644 --- a/.github/workflows/android-linux.yml +++ b/.github/workflows/android-linux.yml @@ -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 diff --git a/.github/workflows/android-macos.yml b/.github/workflows/android-macos.yml index ec8d6d77f204..e62673a12730 100644 --- a/.github/workflows/android-macos.yml +++ b/.github/workflows/android-macos.yml @@ -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 diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml index fb5b223b3443..bdb394eac68e 100644 --- a/.github/workflows/android-windows.yml +++ b/.github/workflows/android-windows.yml @@ -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 diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index d9fade3be0fe..1f937ce653fa 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -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: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 75b489a078c0..0c10765fa60f 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -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: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ac627c6e8295..362237eb2116 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f396c65d7877..e75a937a054d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 12f0d7fa3868..0fc00e488225 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -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: diff --git a/deploy/docker/Dockerfile-build-macos b/deploy/docker/Dockerfile-build-macos index 31d269656c23..9e1630f7c3bd 100644 --- a/deploy/docker/Dockerfile-build-macos +++ b/deploy/docker/Dockerfile-build-macos @@ -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 diff --git a/deploy/docker/Dockerfile-build-ubuntu b/deploy/docker/Dockerfile-build-ubuntu index 76343d286845..cdacc0dcb6a7 100644 --- a/deploy/docker/Dockerfile-build-ubuntu +++ b/deploy/docker/Dockerfile-build-ubuntu @@ -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 diff --git a/deploy/linux/appimagecraft.yml b/deploy/linux/appimagecraft.yml index 98b29b3f4757..2e68d07e692b 100644 --- a/deploy/linux/appimagecraft.yml +++ b/deploy/linux/appimagecraft.yml @@ -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 diff --git a/deploy/vagrant/.vagrantconfig.yml b/deploy/vagrant/.vagrantconfig.yml index 594b46c6ed3c..49fd0a860a9a 100644 --- a/deploy/vagrant/.vagrantconfig.yml +++ b/deploy/vagrant/.vagrantconfig.yml @@ -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' diff --git a/docs/en/qgc-dev-guide/getting_started/index.md b/docs/en/qgc-dev-guide/getting_started/index.md index d945939e7708..6df60f0f8b09 100644 --- a/docs/en/qgc-dev-guide/getting_started/index.md +++ b/docs/en/qgc-dev-guide/getting_started/index.md @@ -1,5 +1,5 @@ --- -qt_version: 6.8.1 +qt_version: 6.8.2 --- # Getting Started with Source and Builds diff --git a/tools/setup/install-qt-debian.sh b/tools/setup/install-qt-debian.sh index 52bfc0448648..705b705288c2 100755 --- a/tools/setup/install-qt-debian.sh +++ b/tools/setup/install-qt-debian.sh @@ -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}" diff --git a/translations/qgc-lupdate.sh b/translations/qgc-lupdate.sh index 9bb933b36047..0278606615ca 100755 --- a/translations/qgc-lupdate.sh +++ b/translations/qgc-lupdate.sh @@ -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