Update submodules on '6.5 in qt/qt5'

Change-Id: I2b3f9bdf3da3bdb3d54c9f423778a11e3da8a92e Reviewed-by: Qt Submodule Update Bot <[email protected]>
2026-09-20 23:57:36 +08:00 · 2023-02-20 12:36:41 +00:00 · 2023-02-17 16:55:51 +00:00 · 2023-02-16 08:44:01 +00:00 · 2023-02-14 04:37:02 +00:00 · 2023-02-14 04:36:58 +00:00
95 changed files with 211 additions and 231 deletions
@@ -315,7 +315,7 @@
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
 	branch = 6.5
-	status = preview
+	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	path = qtgrpc
@@ -9,5 +9,6 @@ Configurations:
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
@@ -8,15 +8,15 @@ Include: [
    ]
 Configurations:
 -
-    Id: 'ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'ubuntu-20.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -33,7 +33,8 @@ Configurations:
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
 -
    Id: 'sles-15_sp4-static'
@@ -42,7 +43,8 @@ Configurations:
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-mysql'
    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
 -
    Id: 'windows-10_22h2-msvc2019'
@@ -133,7 +135,7 @@ Configurations:
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
@@ -161,6 +163,17 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+    ]
+-
+    Id: 'rhel-9.0'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
@@ -2,11 +2,11 @@ Version: 2
 Configurations:
 -
    Id: 'qemu-armv7-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
@@ -19,11 +19,11 @@ Configurations:
    ]
 -
    Id: 'qemu-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -36,11 +36,11 @@ Configurations:
    ]
 -
    Id: 'qemu-mips64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
    Id: 'qnx-710-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -17,12 +17,12 @@ Configurations:
    ]
 -
    Id: 'qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -30,12 +30,12 @@ Configurations:
    ]
 -
    Id: 'qnx-710-armv7-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'armv7'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -47,6 +47,7 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
        'ANDROID_EMULATOR=@emulator_x86_api_23',
@@ -64,6 +65,7 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
@@ -12,7 +12,7 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'ubuntu-20.04-license-check'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-license-check'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
@@ -34,6 +34,6 @@ Configurations:
        Features: ['Packaging', 'UseLegacyInstructions']
        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'GCC'
        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
@@ -2,13 +2,13 @@ Version: 2
 Configurations:
    -
      Id: "integrity-arm64"
-      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+      Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
      Compiler: 'GCC'
      Target os: 'INTEGRITY'
-      Platform dependency: 'ubuntu-20.04'
+      Platform dependency: 'ubuntu-22.04'
      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
      Environment variables: [
-          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
+          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
          'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
@@ -2,42 +2,42 @@ Version: 2
 Module only: True
 Configurations:
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET1'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET2'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET3'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET4'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET5'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET6'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET7'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET8'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET9'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET10'
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    "ubuntu-20.04",
+    "ubuntu-22.04",
    "windows-10_22h2-msvc2019-developer-build",
    "ios-universal"
  ],
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

@@ -14,6 +14,6 @@ Configurations:
    Compiler: 'GCC'
    Features: ['DisableTests']
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
@@ -22,7 +22,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-RHEL-9.0-x86_64-500'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
    Compiler: 'GCC'
    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -34,6 +34,6 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']
@@ -2,8 +2,8 @@ Version: 2
 Include: [ cmake_platforms_target_android.yaml ]
 Configurations:
 -
-    Id: 'automotive-ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'automotive-ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

@@ -63,8 +63,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="31.0.0"
-sdkApiLevel="android-31"
+sdkBuildToolsVersion="33.0.1"
+sdkApiLevel="android-33"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2023 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -48,12 +48,12 @@ PROVISIONING_DIR="$(dirname "$0")/../../"


 localRepo=http://ci-files01-hki.intra.qt.io/input/docker
-upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64
+upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/

 echo '
-    f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb
-    ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb
-    09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb
+    2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
+    ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+    130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
 ' \
    | xargs -n2 | while read  sha f
 do
@@ -68,10 +68,11 @@ sudo docker --version

 # Download and install the docker-compose extension from https://github.com/docker/compose/releases
 f=docker-compose-$(uname -s)-$(uname -m)
+dockerComposeVersion="v2.15.1"
 DownloadURL  \
-    $localRepo/$f-1.24.1  \
-    https://github.com/docker/compose/releases/download/1.24.1/$f \
-    cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
+    $localRepo/$f-${dockerComposeVersion}  \
+    https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
+    bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
 sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
 sudo docker-compose --version
 rm ./docker-compose*
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersionLatest="r25b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"

@@ -143,10 +143,6 @@ build_ffmpeg_android() {
 }

 if [ "$os" == "linux" ]; then
-  if [ -f /etc/redhat-release ]
-  then sudo yum -y install yasm
-  else sudo apt install yasm
-  fi
  build_ffmpeg
  sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
@@ -181,13 +177,14 @@ elif  [ "$os" == "android" ]; then
    target_arch=x86_64
    sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
+    target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86_64"
  else
    target_arch=x86
    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
    sha1="8b254e31411a350edb581bb30e31401866abbe7d"
+    target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86"
  fi

-  target_dir="/opt/android/$ffmpeg_name"
  app_prefix=""

  #try install a pre-build
@@ -67,7 +67,7 @@ installPrefix="$HOME/install-grpc-$version"
 targetDir="$HOME/grpc-$version"
 targetFile="$targetDir.zip"
 DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
-unzip "$targetFile" -d "$HOME"
+unzip -q "$targetFile" -d "$HOME"
 sudo rm "$targetFile"

 # devtoolset is needed when running configuration
@@ -77,10 +77,17 @@ fi

 if uname -a |grep -q Darwin; then
    extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
-    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
    SetEnvVar PATH "\$PATH:$installPrefix/bin"
 fi

+# MacOS
+if [[ -n "$OPENSSL_DIR" ]]; then
+    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
+# Linux
+elif [[ -n "$OPENSSL_HOME" ]]; then
+    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME
+fi
+
 echo "Configuring and building gRPC"

 buildDir="$HOME/build-grpc-$version"
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -53,6 +53,9 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
 libclang_version="15.0.0"

 if uname -a |grep -q Darwin; then
@@ -65,6 +68,11 @@ elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | g
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    sha1="6ca035bb522022d34d61759e0460845832933b5c"
+elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
 else
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
@@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-31"
-$sdkBuildToolsVersion = "31.0.0"
+$sdkApiLevel = "android-33"
+$sdkBuildToolsVersion = "33.0.1"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
@@ -78,6 +78,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# yasm for QtMultimedia
+installPackages+=(yasm)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -78,6 +78,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# yasm for QtMultimedia
+installPackages+=(yasm)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -48,6 +48,7 @@ installPackages=()
 installPackages+=(git)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
+installPackages+=(openssl3)
 installPackages+=(openssl3-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
@@ -78,6 +79,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# yasm for QtMultimedia
+installPackages+=(yasm)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Required by Rhel source build
+sudo yum -y install perl-IPC-Cmd
+
+"$(dirname "$0")/../common/unix/install-openssl.sh" "linux"
@@ -79,6 +79,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# yasm for QtMultimedia
+installPackages+=(yasm)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -97,6 +97,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

+# yasm (for ffmpeg in multimedia)
+sudo zypper -nq install yasm
+
 # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
 sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel

@@ -54,9 +54,9 @@ PROVISIONING_DIR="$(dirname "$0")/../"
 # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
 export PACKAGE_NAME="python"
 python2Version="2.7.18"
-python3Version="3.7.6"
+python3Version="3.8.16"
 python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b"
-python3Sha="55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"
+python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"


 function InstallPython {
@@ -113,4 +113,5 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh

 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+SetEnvVar "PYTHON3_PATH" "/usr/local/bin"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -117,6 +117,7 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(yasm)
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
 # python3 development package
@@ -134,6 +134,7 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev)
 installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
+installPackages+=(yasm)

 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
@@ -10,4 +10,4 @@ cat <<EOT | sudo tee /etc/mdns.allow
 .local
 EOT

-sudo sed -i '/^hosts:/s/.*/hosts:          files mdns_minimal [NOTFOUND=return] dns mdns4/'   /etc/nsswitch.conf
+sudo sed -i '/^hosts:/s/.*/hosts:          files mdns_minimal [NOTFOUND=return] mdns4 dns/'   /etc/nsswitch.conf
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -135,6 +135,7 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev)
 installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
+installPackages+=(yasm)

 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
@@ -143,6 +144,7 @@ installPackages+=(python3-dev)
 installPackages+=(python3-pip)
 installPackages+=(virtualenv)
 installPackages+=(python3-wheel)
+installPackages+=(python-is-python3)
 # python2 development package
 installPackages+=(python2-dev)
 # Automates interactive applications (Needed by RTA to automate configure testing)
@@ -162,6 +164,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
+#Java 11 for Android
+installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
@@ -221,6 +225,7 @@ installPackages+=(ssh)
 installPackages+=(diffstat)
 installPackages+=(binfmt-support)
 installPackages+=(zstd)
+installPackages+=(lz4)
 # Vulkan is needed for examples
 installPackages+=(libvulkan-dev)
 # Needed for qtdltlogging
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install prebuilt OpenSSL which was built against Android NDK 21.
-# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
-
-set -ex
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-version="3.0.3"
-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
-# Source built requires GCC and Perl to be in PATH.
-exports_file="/tmp/export.sh"
-# source previously made environmental variables.
-if uname -a |grep -q "Ubuntu"; then
-    # shellcheck disable=SC1090
-    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
-    rm -rf "$exports_file"
-else
-    # shellcheck disable=SC1090
-    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
-    rm -rf "$exports_file"
-fi
-
-officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
-cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
-targetFile="/tmp/openssl-$version.tar.gz"
-sha="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca"
-opensslHome="${HOME}/openssl/android/openssl-${version}"
-DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
-mkdir -p "${HOME}/openssl/android/"
-tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
-if uname -a |grep -q "Darwin"; then
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
-else
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
-fi
-cd "$opensslHome"
-PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
-PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-'
-
-if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
-    sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
-else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-r23b-linux.tar.gz"
-    sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485"
-fi
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "${HOME}"
-
-opensslHome="${HOME}/openssl/android/openssl-${version}"
-SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
-
-echo "OpenSSL for Android = $version" >> ~/versions.txt
@@ -48,4 +48,4 @@ cat <<EOT | sudo tee /etc/mdns.allow
 .local
 EOT

-sudo sed -i '/^hosts:/s/.*/hosts:          files mdns_minimal [NOTFOUND=return] dns mdns4/'   /etc/nsswitch.conf
+sudo sed -i '/^hosts:/s/.*/hosts:          files mdns_minimal [NOTFOUND=return] mdns4 dns/'   /etc/nsswitch.conf
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -51,8 +51,6 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 version="39fad60085501729985888d3f546c7b8d897a394"
 sha1="c66e3984cd647c8e32977dee72fe9d06f1b2ea28"

-# Provision Ubuntu 20.04-built package for 22.04
-# TODO: Remove libicu66 from 02-apt.sh when updating the package
 url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
 url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash

 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -41,5 +41,4 @@

 set -ex

-# shellcheck source=../common/linux/android_linux.sh
-source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
+"$(dirname "$0")"/../common/linux/cleanup_cache.sh
@@ -43,6 +43,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

+# yasm (for ffmpeg in multimedia)
+sudo zypper -nq install yasm
+
 # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
 sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -75,6 +75,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

+# yasm (for ffmpeg in multimedia)
+sudo zypper -nq install yasm
+
 # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
 sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r25b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r25b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-28"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r25b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r25b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-28"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r25b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-28"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
Author	SHA1	Message	Date
Qt Submodule Update Bot	0b6642c563	Update submodules on '6.5 in qt/qt5' Change-Id: I2b3f9bdf3da3bdb3d54c9f423778a11e3da8a92e Reviewed-by: Qt Submodule Update Bot <[email protected]>	2023-02-20 12:36:41 +00:00
Qt Submodule Update Bot	34980e252b	Update submodules on '6.5 in qt/qt5' Change-Id: Ica21e91019eea437096d8c9c3fc7d40fb6aadb71 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2023-02-17 16:55:51 +00:00
Mårten Nordheim	0cc11596c1	Work around glibc bug in our mdns resolution glibc has a system where, if it fails to perform Happy Eyeballs host name resolution in parallel, it will do it sequentially. We triggered this because our docker setup was not responding to systemd-resolved's AAAA queries over IPv6. The bug in glibc was then that it would poll for 4999ms after sending the first of the two queries. __Every time__ we do mdns host lookup. In tst_QTcpSocket this happens multiple times in ::initTestCase for the proxy global-datatags. That means we would be stuck polling for 4999ms*5 (number of proxy addresses to look up) before every test-case that would use proxy (even if the test just does a return in the proxy-case). Plus another 4999ms for any mdns lookup we would need to perform during the test. This led to the test severely slowing down and timing out quite often. Work around this by doing full mDNS before trying DNS. This will let us resolve multi-label mDNS addresses. Fixes: QTBUG-107696 Change-Id: I26c6b356b4c9712f4ac6d3613998ee448c0ca504 Reviewed-by: Dimitrios Apostolou <[email protected]> (cherry picked from commit `5c6814fb18`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-16 08:44:01 +00:00
Qt Submodule Update Bot	f6b1bf3c96	Update submodules on '6.5 in qt/qt5' Change-Id: Ied967cd3e11fa7d9544aae0561fe3e22b8e195f3 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2023-02-14 04:37:02 +00:00
Samuli Piippo	cf2184002d	Add lz4 for yocto builds Change-Id: I2c612805c32b66ffb18d477b2cf7f098fcd5b05b Reviewed-by: Heikki Halmet <[email protected]> (cherry picked from commit `16af6ab94a`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-14 04:36:58 +00:00
Samuli Piippo	f932c386aa	Add /usr/bin/python to Ubuntu 22.04 Needed in yocto builds: /usr/bin/env: ‘python’: No such file or directory Change-Id: I39cd0c507ba0bd8dd349ffdfffdb53d78a048955 Reviewed-by: Heikki Halmet <[email protected]> (cherry picked from commit `ccc414c844`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-13 18:54:09 +00:00
Heikki Halmet	6e655d52e3	Provisioning: Install OpenSSL 3 for Red Hat 8.4 Pick-to: dev Task-number: QTQAINFRA-4889 Change-Id: Iae783e66a3f4b1421993c5db746bd44a1ef81dd4 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Jani Heikkinen <[email protected]>	2023-02-13 05:32:53 +00:00
Samuel Mira	fe2271bba3	Enable ffmpeg for Android After ffmpeg was removed on Android targets following QTBUG-110172, this patch enables it after fixing the failing test. Task-number: QTBUG-110453 Change-Id: I5598a9b72d06af6664455e933129a08192afac15 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]> (cherry picked from commit `b9c2512748`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-12 16:52:42 +00:00
Heikki Halmet	cd22843cae	Replace Ubuntu 20.04 with Ubuntu 22.04 Libclang version is built with Ubuntu 22.04 on it, others still keep old one which is built with Ubuntu 20.04. Task-number: QTQAINFRA-4926 Change-Id: I47bb49c1efecab6863ae52d3acf7eb47bdc47c35 Reviewed-by: Tony Sarajärvi <[email protected]> (cherry picked from commit `64b24b0d85`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-12 16:36:23 +00:00
Konrad Kujawa	aa520141a0	Set OPENSSL_ROOT_DIR for gRPC unix provisioning script Change-Id: I44fb0f94f183ddc10399c331e8e1a38c533dcf0d Reviewed-by: Alexey Edelev <[email protected]> (cherry picked from commit `5a1ed71917`) Reviewed-by: Qt CI Bot <[email protected]>	2023-02-12 16:36:22 +00:00
Heikki Halmet	e2935f2068	Provisioning: Update Docker This change will upgrade docker-compose version to v2.15.1 Also 'containerd', 'docker-ce' and 'docker-ce-cli' versions will be upgraded to support newer Ubuntu version (20.04) Task-number: QTQAINFRA-5396 Change-Id: I282a1cbc5870db765409985983d29f57936d1798 Reviewed-by: Simo Fält <[email protected]> Reviewed-by: Dimitrios Apostolou <[email protected]> (cherry picked from commit `739cc29b77`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-10 09:04:41 +00:00
Fabian Kosmale	fe3876517f	Enable C++20 standard for Windows developer builds Gives more CI coverage against build failures. Task-number: QTQAINFRA-4117 Task-number: QTQAINFRA-4242 Change-Id: I64e476cbbb74bde861fa85c677bcdc7ca91dac2d Reviewed-by: Oliver Wolff <[email protected]> Reviewed-by: Heikki Halmet <[email protected]> (cherry picked from commit `d7795c98ef`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-09 18:39:56 +00:00
Assam Boudjelthia	c46c54fe7d	Coin: bump Android platform sdk and build tools version to 33 Use latest platform and build tools to be able to build for Android 13. Change-Id: I00bd9948f528d398d471e91de1d22954d786be29 Reviewed-by: Juha Vuolle <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]> (cherry picked from commit `8abebe23ef`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-03 21:30:44 +00:00
Qt Submodule Update Bot	270ce23a1b	Update submodules on '6.5 in qt/qt5' Change-Id: If2bb0a60d7df472139889f4241b6799c1b6539ed Reviewed-by: Qt Submodule Update Bot <[email protected]>	2023-02-03 09:22:18 +00:00
Jani Heikkinen	09fc2df086	Qt6: Remove 'TP' status from qtquick3dphysics from Qt 6.5 -> qtquick3dphysics will be officially supported module form Qt 6.5 -> so change the status in .gitmodules from preview to addon Task-number: QTBUG-107387 Change-Id: Ic117f4cf3e99e4a2f59bd84aa14979419a3533b9 Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit `172ca715e6`) Reviewed-by: Jonas Karlsson <[email protected]>	2023-02-02 10:02:32 +02:00
Simo Fält	5271768423	Provisioning: Update Python3 from 3.7 to 3.8 Change-Id: I0884e87fbc56e4e1060406b2fc214b33c40c475c Reviewed-by: Iikka Eklund <[email protected]> (cherry picked from commit `5b22f8ec2e`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-02-01 08:15:52 +00:00
Heikki Halmet	3917d45ac1	Add additional target for Red Hat 9.0 x86_64 We need to keep Red Hat 8.4 or 8.6 for packaging target and for Android targets at the moment. If we switch to use RHEL 9 it will cause problems with GLIBC with older distros. Let's add additional target for Red Hat 9 without packaging flag to catch the issues Task-number: QTQAINFRA-5111 Change-Id: I3056a820cfdf61fc307cbd07f561afe31ad689f7 Reviewed-by: Ville Voutilainen <[email protected]> Reviewed-by: Jani Heikkinen <[email protected]> (cherry picked from commit `3831a11120`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-01-27 14:49:32 +00:00
Heikki Halmet	bdc867146a	Remove ffmpeg for Android 12 This is causing autotest failures in multimedia. Pick-to: dev Task-number: QTBUG-110453 Change-Id: I0c974b7faa6f0a434e65782f22984b532673dea3 Reviewed-by: Artem Dyomin <[email protected]> Reviewed-by: Jani Heikkinen <[email protected]>	2023-01-25 19:23:25 +00:00
Artem Dyomin	397f2dadd4	Fix missing ffmpeg for desktop Linux CI platforms What's done: - ffmpeg build added to OpenSuse platforms - installing of yasm moved to packages install file in order to get rid of OS checkings Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4 Reviewed-by: Axel Spoerl <[email protected]> Reviewed-by: Lars Knoll <[email protected]> (cherry picked from commit `e5cf7b2d58`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-01-25 09:28:53 +00:00
Heikki Halmet	394f69b2cd	Fix template name for RHEL-9 in qtcreator.yaml Change-Id: Ib2dcb3549e97d27aaae8522094b2602350cf2ecd Reviewed-by: Antti Kokko <[email protected]> (cherry picked from commit `72eb1b1a5d`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2023-01-25 08:29:02 +00:00