FFmpeg, Android: Add support for Android ARMv7 in Unix FFmpeg script

This patch introduces support for building FFmpeg for Android ARMv7 on Unix hosts. Pick-to: 6.9 6.8 Change-Id: I21affa1137cb4b3aa3a5b9cfd5c71e755684db9c Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Rami Potinkara <[email protected]> (cherry picked from commit 4170b81aea) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
Provisioning: Take repo-clones-apt into use in Ubuntu 24.04
2026-09-21 16:06:57 +08:00 · 2025-09-05 05:26:57 +00:00 · 2025-09-05 05:26:53 +00:00 · 2025-09-05 08:26:48 +03:00 · 2025-09-05 05:26:43 +00:00 · 2025-09-05 05:26:40 +00:00
79 changed files with 297 additions and 97 deletions
@@ -7,7 +7,14 @@ Include: [
    macos.yaml
    ]
 Configurations:
-# Build on Ubuntu 22.04
+# Build on Ubuntu 22.04 and test on both X11 and Wayland later
+-
+    Id: 'ubuntu-22.04-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
    Id: 'ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -18,6 +25,19 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
    ]
+# Test on Ubuntu 22.04 X11
+-
+    Id: 'ubuntu-22.04-developer-build-x11-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04-developer-build'
+-
+    Id: 'ubuntu-22.04-x11-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04'
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
    Id: 'ubuntu-24.04-arm64-developer-build'
@@ -92,13 +112,13 @@ Configurations:
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
    Id: 'ubuntu-24.04-x64-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x64'
 -
    Id: 'opensuse-15.6-developer-build'
@@ -176,7 +196,7 @@ Configurations:
    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Platform dependency: 'windows-10_22h2-mingw13'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -199,7 +219,7 @@ Configurations:
    Platform dependency: 'windows-10_22h2-mingw13'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
@@ -355,7 +375,7 @@ Configurations:
        'DEBIAN_RULES_REF=6.10_gles',
        'COIN_TARGET_DIST=tqtc-bookworm',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
+        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
    ]
@@ -24,6 +24,19 @@ Configurations:
        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
+        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
+        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
+        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
    Id: 'rhel-8.10-minimal-static-test'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
@@ -3,8 +3,8 @@ Module only: True
 Include: [
  cmake_platforms.yaml: [
    "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
-    "ubuntu-24.04-x64-developer-build-x11-tests",
+    "ubuntu-22.04-developer-build",
+    "ubuntu-22.04-developer-build-x11-tests",
    "windows-11_24H2-msvc2022-developer-build",
    "ios-universal"
  ],
@@ -6,7 +6,7 @@ Include: [
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
    "opensuse-15.6-developer-build",
    "sles-15_sp6-static",
@@ -7,7 +7,7 @@ Include: [
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
    "opensuse-15.6-developer-build",
    "sles-15_sp6-static",
@@ -70,6 +70,17 @@ Configurations:
        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
+-
+    Id: 'Windows-MSVC2022-arm64_Static-23H2'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
+    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
    Id: 'Windows-MSVC2022_Static'
    Template: 'qtci-windows-10_22H2-x86_64-53'
@@ -5,9 +5,13 @@
 set -ex

 function waitLoop {
+    while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+        echo "Waiting for other software managers to finish... 1/2"
+        sleep 0.5
+    done

-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-    echo "Waiting for other software managers to finish..."
-    sleep 0.5
-done
+    while sudo fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do
+        echo "Waiting for other software managers to finish... 2/2"
+        sleep 0.5
+    done
 }
@@ -23,7 +23,7 @@ DownloadURL "$urlCache" "$urlOccifical" "$sha" "/tmp/Docker_${chip}.dmg"

 sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
 sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
-sudo hdiutil detach /Volumes/Docker
+sudo hdiutil detach /Volumes/Docker -force

 # Add registry mirror for docker images
 mkdir "$HOME/.docker"
@@ -32,8 +32,6 @@ installPkg() {
        "/tmp/Homebrew-$VERSION.pkg"

    sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target /
-    # Add homebrew to PATH
-    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"

    echo "Homebrew = $VERSION" >> ~/versions.txt
 }
@@ -65,6 +63,14 @@ else
    installPkg
 fi

+ARCH_TYPE=$(arch)
+# Add homebrew to PATH
+if [ "$ARCH_TYPE" == "arm64" ]; then
+    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"
+else
+    SetEnvVar "PATH" "/usr/local/bin:\$PATH"
+fi
+
 # Disable non-ascii output for homebrew to make logs more readable
 SetEnvVar "HOMEBREW_NO_COLOR" "1"
 SetEnvVar "HOMEBREW_NO_EMOJI" "1"
@@ -9,7 +9,17 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
+# HOMEBREW_DIR depends on acrhitecture
+ARCH_TYPE=$(arch)
+if [ "$ARCH_TYPE" == "arm64" ]; then
+    HOMEBREW_DIR="/opt/homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
+else
+    HOMEBREW_DIR="/usr/local/Homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
+fi
+
+brew tap-new local/libiodbc
+cp "${BASH_SOURCE%/*}/libiodbc.rb" "$HOMEBREW_DIR/"
+brew install local/libiodbc/libiodbc "$@"

 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}
@@ -31,6 +31,12 @@ if ! command -v patchelf; then
    exit 1
 fi

+# Get patchelf version
+patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}')
+if [[ "$patchelf_version" == "0.18.0" ]]; then
+    echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
+fi
+
 ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
 stub_prefix="Qt6FFmpegStub-"

@@ -4,12 +4,13 @@ RUN apt-get update && apt-get -y install $packages

 # Get californium-based CoAP test server
 WORKDIR /root/src
-ADD californium-*.tar.gz .
+ADD californium-3.8.0.tar.gz .
 RUN mv californium-* californium
 WORKDIR /root/src/californium
 ADD qt_changes.patch ./
 RUN patch -p1 < qt_changes.patch
-RUN mvn clean install -q -DskipTests
+ADD californium-m2deps-3.8.0.tar.gz /root
+RUN mvn clean install -o -q -DskipTests
 WORKDIR /

 EXPOSE 5683/udp 5684/udp
@@ -60,6 +60,16 @@ DownloadURL  \
    24f8ca393f26c922739462e4586b8ced1ff75f99bfa795defa34a967b5a4a5a0  \
    californium-3.8.0.tar.gz
 mv californium-3.8.0.tar.gz "$SERVER_PATH/californium/"
+# Download cached maven dependencies for californium.
+# The dependency archive is built by
+# "mvn dependency:go-offline -DskipTests -Dos.detected.classifier=linux-x86_64"
+# and archived from /root/.m2
+DownloadURL  \
+    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
+    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
+    e2fade7dde3cca02bb910eed99a5d8b5cb8ff945240c65bf06ce50411d70d3f2  \
+    californium-m2deps-3.8.0.tar.gz
+mv californium-m2deps-3.8.0.tar.gz "$SERVER_PATH/californium/"


 echo 'Building the docker images...'
@@ -48,6 +48,12 @@ build_ffmpeg_android() {
        target_cpu=i686
        openssl_libs="$openssl_android_path/x86"
        libs_prefix="_x86"
+    elif [ "$target_arch" == "arm32" ]; then
+        target_toolchain_arch="armv7a-linux-androideabi"
+        target_arch=arm
+        target_cpu=armv7-a
+        openssl_libs="$openssl_android_path/armeabi-v7a"
+        libs_prefix="_arm32-v7a"
    elif [ "$target_arch" == "arm64" ]; then
        target_toolchain_arch="aarch64-linux-android"
        target_arch=aarch64
@@ -116,6 +122,12 @@ elif  [ "$os" == "android-x86_64" ]; then
    envvar_latest="FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST"
    envvar_nightly1="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1"
    envvar_nightly2="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2"
+elif  [ "$os" == "android-arm32" ]; then
+    target_arch=arm32
+    target_dir="/usr/local/android/ffmpeg-arm32"
+    envvar_latest="FFMPEG_DIR_ANDROID_ARM32_NDK_LATEST"
+    envvar_nightly1="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY1"
+    envvar_nightly2="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY2"
 elif  [ "$os" == "android-arm64" ]; then
    target_arch=arm64
    target_dir="/usr/local/android/ffmpeg-arm64"
@@ -134,19 +146,19 @@ fi

 assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST"
 assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST"
-build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
-set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir"
+build_ffmpeg_android "$target_arch" "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
+set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir/latest"

 if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then
    assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1"
    assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
+    build_ffmpeg_android "$target_arch" "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
    set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1"
 fi

 if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then
    assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2"
    assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
+    build_ffmpeg_android "$target_arch" "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
    set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2"
 fi
@@ -5,6 +5,7 @@

 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2
+# See patchelf bugreport: https://github.com/NixOS/patchelf/issues/576.
 patchelf_version="0.17.2"

 url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz"
@@ -30,6 +30,52 @@ function GetFfmpegDefaultConfiguration {
    return $defaultConfiguration
 }

+# Returns the absolute installation path of FFmpeg for this build
+# variant.
+function ResolveFFmpegInstallDir {
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$buildSystem,
+
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ndkVer
+    )
+
+    if ($ndkVer) {
+        $prefix = "installed-ndk-$ndkVer"
+    } else {
+        $prefix = "installed"
+    }
+
+    return "C:\$ffmpeg_name\build\$buildSystem\$prefix"
+}
+
+# Returns the absolute installation path of FFmpeg for this build
+# variant. Returns a path that is compatible with MSYS.
+#
+# TODO: There is some code duplications here. Make a helper function
+# that translates native Windows paths into MSYS compatible paths.
+function ResolveFFmpegInstallDirMsys {
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$buildSystem,
+
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ndkVer
+    )
+    if ($ndkVer) {
+        $prefix = "installed-ndk-$ndkVer"
+    } else {
+        $prefix = "installed"
+    }
+
+    return "/c/$ffmpeg_name/build/$buildSystem/$prefix"
+}
+
 function InstallFfmpeg {
    Param (
        [string]$config,
@@ -53,15 +99,16 @@ function InstallFfmpeg {
    $env:MSYSTEM = $msystem

    if ($ndk_ver) {
-        $prefix = "installed-ndk-$ndk_ver"
+        $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem -ndkVer $ndk_ver
+        $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_ver
    } else {
-        $prefix = "installed"
+        $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem
+        $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem
    }
-    $installDir = "C:\$ffmpeg_name\build\$buildSystem\$prefix"

    $cmd = "cd /c/$ffmpeg_name"
    $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem"
-    $cmd += " && ../../configure --prefix=$prefix $config"
+    $cmd += " && ../../configure --prefix=$installDirForMsys $config"
    if ($toolchain) {
        $cmd += " --toolchain=$toolchain"
    }
@@ -191,8 +238,8 @@ function InstallAndroidArmv7 {
    $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a"
    $config += " --strip=$strip"

-
-    $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version
+    $buildSystem = "android-arm"
+    $result= InstallFfmpeg -config $config -buildSystem $buildSystem -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version

    Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so
    Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so
@@ -218,9 +265,14 @@ function InstallAndroidArmv7 {

    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./bootstrap.sh && ./configure && make install`"")

-    $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no"
+    $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_version
+    $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh ${installDirForMsys} _armeabi-v7a no"
    $command = $command.Replace("\", "/")
-    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"")
+    $patchResult = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"")
+    if ($patchResult.ExitCode) {
+        Write-Host "fix_ffmpeg_dependencies.sh did not finish successfully"
+        return $false
+    }

    return $result
 }
@@ -41,8 +41,8 @@ EOF
 sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild

-# Create chroot for debian stable
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
+# Create chroot for debian bookworm
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64

 echo "Create chroot for Ubuntu Jammy"
 # First we need update the deboostrap scripts
@@ -60,5 +60,5 @@ sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy
 echo "Done creating chroot for Ubuntu Jammy"

 # Update chroot.
-sudo sbuild-update -udcar stable
+sudo sbuild-update -udcar bookworm
 sudo sbuild-update -udcar jammy
@@ -181,6 +181,9 @@ sudo /usr/bin/pip3 install dataclasses
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

@@ -145,5 +145,8 @@ sudo /usr/bin/pip3 install wheel
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -157,5 +157,8 @@ sudo /usr/bin/pip3 install wheel
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -167,5 +167,8 @@ sudo /usr/bin/pip3 install dataclasses
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -181,6 +181,9 @@ sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/requirements.t
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

@@ -171,5 +171,8 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -202,6 +202,9 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

@@ -205,6 +205,9 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

@@ -101,3 +101,6 @@ sudo zypper -nq install openssl-3

 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
+
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
@@ -113,5 +113,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -116,5 +116,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -66,6 +66,9 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

@@ -266,5 +266,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -40,7 +40,7 @@ sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild

 # Create chroot
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian

 # For ubuntu 22.04
 echo "Create chroot for Ubuntu Jammy"
@@ -49,7 +49,7 @@ sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates jammy /srv/ch
 echo "Done creating chroot for Ubuntu Jammy"

 # Update chroot.
-sudo sbuild-update -udcar stable
+sudo sbuild-update -udcar bookworm



@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2025 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # Install required packages with APT
@@ -20,15 +20,14 @@ function set_internal_repo {
    sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}

    sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-arm64 main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-arm64 main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-arm64 main restricted universe
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-arm64 main restricted universe multiverse
 EOC
 }

-#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
@@ -262,5 +261,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2025 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # Install required packages with APT
@@ -20,18 +20,16 @@ function set_internal_repo {
    sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}

    sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-amd64 main restricted universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-amd64 main restricted universe multiverse
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-i386 main restricted universe multiverse
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-i386 main restricted universe multiverse
 EOC
 }

-#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
@@ -273,5 +271,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -72,5 +72,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -78,5 +78,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -91,5 +91,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -90,5 +90,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
@@ -4,4 +4,4 @@

 set -ex

-brew install patchelf
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
Author	SHA1	Message	Date
Nils Petter Skålerud	dd4278ddc1	FFmpeg, Android: Add support for Android ARMv7 in Unix FFmpeg script This patch introduces support for building FFmpeg for Android ARMv7 on Unix hosts. Pick-to: 6.9 6.8 Change-Id: I21affa1137cb4b3aa3a5b9cfd5c71e755684db9c Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Rami Potinkara <[email protected]> (cherry picked from commit `4170b81aea`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-05 05:26:57 +00:00
Ville-Pekka Karhu	c25feffb9b	Provisioning: Take repo-clones-apt into use in Ubuntu 24.04 Pick-to: 6.9 6.8 Task-number: QTQAINFRA-6297 Change-Id: I7d9b3edc2b2429361e421ce13b5c36f4247693f6 Reviewed-by: Tero Heikkinen <[email protected]> (cherry picked from commit `13487118df`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-05 05:26:53 +00:00
Tero Heikkinen	7394584ab5	Linux: Fix Debian packagekit failing in provisioning Target jammy-arm64-debian-pkg-packaging fails in waitLoop function, which is also used by Ubuntu platforms. Fix by extending wait loop for lock paths: - /var/lib/dpkg/lock - /var/lib/apt/lists/lock (new) Task-number: QTQAINFRA-7361 Change-Id: If8d5eacaeb72ea6a36496093bc5c248f61997afb Reviewed-by: Ville-Pekka Karhu <[email protected]>	2025-09-05 08:26:48 +03:00
Toni Saario	a64f150422	Cache maven dependencies for californium build The fetching from 3rd party repos has become very flaky. To avoid mirrors throttling us and other flaky issues cache the dependencies and set -o to enable offline mode. This seems to also speed up the step considerably. Pick-to: 6.9 6.8 6.5 Change-Id: I01663e60baa44ab828d8880ab8b346034a50b60e Reviewed-by: Simo Fält <[email protected]>	2025-09-05 05:26:43 +00:00
Nils Petter Skålerud	18a08f7eb6	FFmpeg, Android ARMv7: Use correct build folder when fixing deps This patch amends 133de012af95507ac485845d8de8f58da005df64. The previous patch introduced a regression where the newer build paths were not being passed correctly into 'fix_ffmpeg_dependencies.sh' during FFmpeg Android builds. This patch introduces a common function to resolve the installation directory, which is then used both during compilation and during FFmpeg patching. Additionally, it introduces some basic error-handling when running 'fix_ffmpeg_dependencies.sh' so that we can catch this issue in integration, in the future. Fixes: QTBUG-138615 Change-Id: I195ebd3034a3184bad32e75916a41a20838b2db1 Reviewed-by: Artem Dyomin <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]> (cherry picked from commit `7f416abf32`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-05 05:26:40 +00:00
Nils Petter Skålerud	14dcdd32d7	macOS, FFmpeg: Don't use patchelf 0.18 for Android FFmpeg patching At the time of writing, homebrew ships patchelf version 0.18.0. This version of patchelf has a bug specific to Androd binaries. The macOS 14 arm64 host currently uses this version of patchelf. This causes an issue during runtime linking in Qt Multimedia applications on Android. This patch modifies the macOS 14 arm64 host to use patchelf v0.17.2 that we compile from source. It also adds warnings to the provisioning log should someone try to use v0.18.0 in the future. Fixes: QTBUG-136930 Pick-to: 6.9 6.8 Change-Id: Id66b560e6a1d4300a54017e9c3366720dc291944 Reviewed-by: Artem Dyomin <[email protected]> (cherry picked from commit `61046109cf`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-05 05:26:36 +00:00
Elias Toivola	c1798a5ea8	Android FFmpeg: Further fix FFmpeg build directories This fixes "does not exist" errors when trying to build multiple NDKs. This amends `303b4c13dc` Pick-to: 6.9 6.8 6.5 Task-number: QTQAINFRA-7069 Change-Id: I29f5cd85ffb3cf12a81b5816a5601ea37446042d Reviewed-by: Assam Boudjelthia <[email protected]> (cherry picked from commit `ffc15eb35f`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-05 05:26:31 +00:00
Qt Submodule Update Bot	b00e1853b4	Update submodules on '6.10 in qt/qt5' Change-Id: Ida27d2492476ba87e3fa3f6f7c0cc1e13d62297e Reviewed-by: Qt Submodule Update Bot <[email protected]>	2025-09-05 05:26:22 +00:00
Axel Spoerl	582a05fab0	Make ubuntu-24.04-x64-x11-tests test insignificant Ubuntu 24.04 installs Wayland by default. The X11 version is known to be problematic, which is why ubuntu-24.04-x64-documentation-x11-tests has been marked InsignificantTests. Extend this to ubuntu-24.04-x64-x11-tests. Task-number: QTBUG-137909 Task-number: QTBUG-136092 Pick-to: 6.9 6.8 6.5 Change-Id: I38f4bb5ca59255870dc6dbbb69e9ab339c679ddc Reviewed-by: Ville-Pekka Karhu <[email protected]> (cherry picked from commit `75b7834370`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-09-02 14:04:01 +00:00
Tero Heikkinen	eb22c91aa5	Windows ARM: Remove Packaging flag from WoA 11 22h2 target Target: windows-11_24H2-msvc2022-arm64 Task-number: QTQAINFRA-6973 Task-number: QTQAINFRA-6109 Pick-to: 6.9 Change-Id: I82153c08e327a211fd604f803b901370f06e35df Reviewed-by: Jani Heikkinen <[email protected]>	2025-09-01 18:38:11 +03:00
Qt Submodule Update Bot	84833b070d	Update submodules on '6.10 in qt/qt5' Change-Id: I2470c30de154186f07ed83f7a71c4dba59cd1e3f Reviewed-by: Qt Submodule Update Bot <[email protected]>	2025-08-30 23:52:07 +00:00
Aku Pietikäinen	014d327331	Use correct PATH for homebrew based on architecture Task-number: QTQAINFRA-6903 Change-Id: I1b5f529e8e94a7e609b5be1704ed83f6380f4cc5 Reviewed-by: Ville-Pekka Karhu <[email protected]> (cherry picked from commit `f73de1b6a8`) Reviewed-by: Simo Fält <[email protected]>	2025-08-29 10:47:22 +00:00
Tor Arne Vestbø	ff0c5876af	coin: Force detach Docker volume unmount Change-Id: I6c19b374adf3d4cd75a3307474e973af96613378 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit `e8f8c9e845`) Reviewed-by: Ville-Pekka Karhu <[email protected]> Reviewed-by: Simo Fält <[email protected]> Reviewed-by: Tor Arne Vestbø <[email protected]>	2025-08-29 10:47:18 +00:00
Aku Pietikäinen	d37592b726	Change libiodbc brew to use local tap Installing directly from rb file no longer supported by homebrew without HOMEBREW_DEVELOPER set after https://github.com/Homebrew/brew/pull/20414 was merged. Create local tap for install to avoid need for homebrew developer mode. Task-number: QTQAINFRA-7344 Change-Id: Id59af01875b16d1757b1dba36c2ba04bf973c212 Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `a9b7487138`) Reviewed-by: Ville-Pekka Karhu <[email protected]> Reviewed-by: Tero Heikkinen <[email protected]>	2025-08-29 10:47:15 +00:00
Liang Qi	3d536d157d	Revert "platform_configs: remove two u2204 tests" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit `e2e25e8a66`. Pick-to: 6.9 6.8 Task-number: QTBUG-137909 Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit `da4d20137c`) Reviewed-by: Tero Heikkinen <[email protected]> Reviewed-by: Jukka Jokiniva <[email protected]>	2025-08-28 10:23:23 +02:00
Liang Qi	ca83c9896a	Revert "platform_configs: remove ubuntu-22.04-developer-build" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit `6db000ab67`. Pick-to: 6.9 6.8 Task-number: QTBUG-137909 Change-Id: Iec2323da11354b3176c2428e441965b77fd768a1 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit `e9f41970c4`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-08-28 10:23:21 +02:00
Qt Submodule Update Bot	68425f29bb	Update submodules on '6.10 in qt/qt5' Change-Id: Ia9f4d1a7cb2ebc591ccd64f9d75872b15bd5e7ee Reviewed-by: Qt Submodule Update Bot <[email protected]>	2025-08-26 02:00:02 +00:00
Liang Qi	feabc0fdcf	Revert "platform_configs: remove InsignificantTests for u2404 x11 dev" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit `365860ce42`. Pick-to: 6.9 6.8 Task-number: QTBUG-137909 Change-Id: I058c5d9c5e67bbea4a5ea88a915270ef00110d7a Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit `e9687ee42e`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-08-25 11:57:27 +00:00
Tero Heikkinen	91627c3294	Add missing static targets to Windows on ARM 11 23h2 Targets - windows-11_23h2-arm64-msvc2022-minimal-static-test - Windows-MSVC2022-arm64_Static-23H2 Task-number: QTQAINFRA-7273 Task-number: QTQAINFRA-6973 Pick-to: 6.9 Change-Id: I1e2110973d0ad0645c1f5b62c420655c94235eab Reviewed-by: Samuli Piippo <[email protected]> Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `acb1eb656a`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-08-23 21:35:07 +00:00
Simo Fält	cbc5c3405b	COIN: Replace Debian stable with bookworm chroot Stable is debian codename and the script was ran in Ubuntu, so it makes me wonder how did this warm in the first place. Pick-to: 6.9 6.8 Change-Id: I6d907ce11d53aa498ea93522539891f38e7c8388 Reviewed-by: Tero Heikkinen <[email protected]> (cherry picked from commit `77eb380ac0`) Reviewed-by: Alexandru Croitor <[email protected]>	2025-08-20 19:51:27 +03:00
Simo Fält	4403eaf71c	COIN: Fix Debian bookworm chroot Debian stable codename is now trixie. Pick-to: 6.9 6.8 Change-Id: I296782cef2a4329e359413cd7515a8dfca271095 Reviewed-by: Jani Heikkinen <[email protected]> (cherry picked from commit `2dbbd0853f`) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit `d7166acfae`)	2025-08-20 12:44:41 +00:00
Tero Heikkinen	763fb46b70	Linux: Add glibc versions visible in versions.txt Will also make glibc versions visible in Tools and Versions pages. Task-number: QTQAINFRA-7333 Pick-to: 6.9 6.8 6.5 Change-Id: Ic0274822f326e4b23ed423d8da20002bc6d4f20a Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `3ba1fb95be`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-08-20 12:44:41 +00:00
Michal Klocek	8b54ca691c	Add qt-zlib config to cross-compile window target After shocking realization that build artifacts are mixed between cross-compiled and native window arm builds for installer add missing qt-zlib config, so configs match better. The -no-opengl mismatch is covered in different patch. Any auto detected platform configs and features mismatch is unknown, but let's do hope it works (as the final output is not covered by single ci test). Pick-to: 6.9 Task-number: QTBUG-138859 Change-Id: I03562f1b518cf711cee894b5cf3f4512e2521f77 Reviewed-by: Tero Heikkinen <[email protected]> (cherry picked from commit `493b592568`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2025-08-18 10:30:08 +00:00