Update submodules on '6.8.0 in qt/qt5'

Change-Id: Id5147c9f3ed485a435a1a36cc70a503745c20407 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-31 02:46:00 +08:00 · 2024-10-02 20:45:54 +00:00 · 2024-09-30 09:21:56 +00:00 · 2024-09-27 12:00:50 +00:00 · 2024-09-27 05:22:45 +00:00 · 2024-09-26 01:45:25 +00:00
46 changed files with 52 additions and 47 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -47,7 +47,7 @@ Configurations:
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
    Environment variables: [
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
 -
    Id: 'ubuntu-24.04-arm64'
@@ -58,7 +58,7 @@ Configurations:
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 # Test on Ubuntu 24.04 ARM64 offscreen
 -
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh
@@ -231,6 +231,8 @@ installPackages+=(jq)
 installPackages+=(cmake)
 # extra linkers
 installPackages+=(lld)
+# Fix dependencies in shared ffmpeg libs
+installPackages+=(patchelf)

 echo "Running update for apt"
 waitLoop
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh
@@ -10,8 +10,8 @@ set -ex
 # This script will install ICU

 icuVersion="73.2"
-icuLocationLib="/opt/icu/lib64"
-icuLocationInclude="/opt/icu/include"
+icuLocationLib="/usr/local/lib"
+icuLocationInclude="/usr/local/include"
 sha1="82f3ed54fd7ea8ff469d9000164e4dc23378fc8c"
 baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z"
 baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z"
@@ -38,7 +38,7 @@ DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFil
 7z x -y -o"$tempDir" "$targetFile"

 sudo cp -a "$tempDir"/lib/* "$icuLocationLib"
-sudo cp -a "$tempDir"/* /opt/icu/
+sudo cp -a "$tempDir"/include/* "$icuLocationInclude"

 sudo rm "$targetFile"
 sudo rm -fr "$tempDir"
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	0c20a491c1	Update submodules on '6.8.0 in qt/qt5' Change-Id: Id5147c9f3ed485a435a1a36cc70a503745c20407 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-10-02 20:45:54 +00:00
Qt Submodule Update Bot	2c1f932497	Update submodules on '6.8.0 in qt/qt5' Change-Id: I39c23ef88c82479a0a01c999fa5cc9966d877a6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-09-30 09:21:56 +00:00
Liang Qi	4c7b2b6dad	Provisioning: Install libicu to /usr/local on Ubuntu 24.04 arm64 This amends `86a9bd1bb2` . Task-number: QTQAINFRA-6510 Task-number: QTBUG-129422 Change-Id: I7ffa5c23dda20fbe3a32e302adc20d2b8e41f52f Reviewed-by: Liang Qi <liang.qi@qt.io>	2024-09-27 12:00:50 +00:00
Qt Submodule Update Bot	ef9a5d70e6	Update submodules on '6.8.0 in qt/qt5' Change-Id: I831f0353843f4fe1b407b1443cd361a9059ed0de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-09-27 05:22:45 +00:00
Qt Submodule Update Bot	563eed7da3	Update submodules on '6.8.0 in qt/qt5' Change-Id: I764e341b3e3c0c454fcd71304d331ff4b7fa4989 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-09-26 01:45:25 +00:00
Liang Qi	432eb5f687	add support for ffmpeg on Ubuntu 24.04 arm64 This follows * `5a79cf9168` adding 90-install-ffmpeg.sh * `83adc86c53` patchelf and -DQT_DEPLOY_FFMPEG=TRUE Task-number: QTBUG-126289 Change-Id: I15300c5be750a784490d1e6cce935aeb423609ab Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit `522ac7fd76`) Reviewed-by: Liang Qi <liang.qi@qt.io>	2024-09-23 05:05:29 +00:00