Qt: Update to 6.8.2

2025-02-12 02:42:32 -05:00
parent 0c8dddc0be
commit 7f406f1d41
16 changed files with 19 additions and 19 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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
@@ -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:
@@ -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

@@ -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
@@ -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

@@ -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'

@@ -1,5 +1,5 @@
 ---
-qt_version: 6.8.1
+qt_version: 6.8.2
 ---

 # Getting Started with Source and Builds
@@ -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}"
@@ -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