Update submodules on '6.6.0 in qt/qt5'

Change-Id: I66682550e2e10f1d48f0d12f18d62418c0e52a92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-04 05:57:42 +08:00 · 2023-10-04 05:20:22 +00:00 · 2023-10-02 17:24:10 +00:00 · 2023-10-01 18:25:49 +03:00 · 2023-10-01 15:25:44 +00:00 · 2023-10-01 15:25:40 +00:00
64 changed files with 354 additions and 127 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.6
+	branch = 6.6.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.6
+	branch = 6.6.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.6
+	branch = 6.6.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.6
+	branch = 6.6.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.6
+	branch = 6.6.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.6
+	branch = 6.6.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,86 +252,87 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.6
+	branch = 6.6.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.6
+	branch = 6.6.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.6
+	branch = 6.6.0
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
+	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.6
+	branch = 6.6.0
 	status = preview
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.6
+	branch = 6.6.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.6
+	branch = 6.6.0
 	status = preview
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,6 @@ project(Qt
 # Required so we can call ctest from the root build directory
 enable_testing()

-set(qt_module_prop_prefix "__qt_prop_")
-
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT QT_BUILD_STANDALONE_TESTS)
    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -279,3 +279,26 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
    ]
+-
+    Id: 'focal-arm64-debian-pkg-packaging'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
+    Environment variables: [
+        'DEBIAN_RULES_REF=6.6_dev',
+        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
+    ]
+-
+    Id: 'focal-amd64-debian-pkg-packaging'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
+    Environment variables: [
+        'DEBIAN_RULES_REF=6.6_dev',
+        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
+
+    ]
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -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 arm64-v8a',
        '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=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
@@ -28,7 +28,7 @@ Configurations:
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
        '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=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
@@ -43,7 +43,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_X86}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=@emulator_x86_api_23',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
@@ -59,7 +59,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_X86_64}} -DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
    ]
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -22,5 +22,6 @@ Configurations:
        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6',
        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
+        'ANDROID_EMULATOR=@emulator_x86_api_23'
    ]
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -3,6 +3,8 @@ Module only: True
 Include: [
  cmake_platforms.yaml: [
    "ubuntu-22.04",
+    "ubuntu-22.04-documentation",
+    "ubuntu-22.04-documentation-x11-tests",
    "windows-10_22h2-msvc2019-developer-build",
    "ios-universal"
  ],
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -3,7 +3,8 @@ Include: [
    cmake_platforms.yaml: [
        'rhel-8.6',
        'windows-10_22h2-mingw11',
-        'ubuntu-22.04-documentation'
+        'ubuntu-22.04-documentation',
+        'ubuntu-22.04-documentation-x11-tests'
    ],
    macos.yaml: [
        'macos-universal-on-x86_64'
@@ -29,6 +30,6 @@ Configurations:
        '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}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
    ]
--- a/coin/provisioning/common/shared/ffmpeg_config_options.txt
+++ b/coin/provisioning/common/shared/ffmpeg_config_options.txt
@@ -1 +1 @@
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic
+--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -49,7 +49,7 @@ versionNode="v14.18.2"
 tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
 if uname -a |grep -q Darwin; then
    tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
-    sha="e9369deda4013fc24e085affc9975833cb2d9872"
+    sha="fe9900b0f27ada608f25552dbd4a58bf62c6f05b"
 else
    tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
    sha="000bbd5666d8fc1afbf2dce1a7938ef0efeeab3f"
--- a/coin/provisioning/common/unix/install-ffmpeg-android.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh
@@ -105,7 +105,7 @@ build_ffmpeg_android() {
  strip=${toolchain_bin}/llvm-strip

  ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
-  ffmpeg_config_options+=" --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
+  ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
  ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
  ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"

--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -65,6 +65,24 @@ fi

 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")

+install_ff_nvcodec_headers() {
+  nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
+  nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
+  nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+  nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
+  #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
+  nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
+  if [ ! -d  "$nv_codec_dir" ];
+  then
+    InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" ""
+  fi
+
+  sudo make -C "$nv_codec_dir" install -j
+
+  # Might be not detected by default on RHEL
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
+}
+

 build_ffmpeg() {
  local arch="$1"
@@ -90,6 +108,9 @@ build_ffmpeg() {
 }

 if [ "$os" == "linux" ]; then
+  install_ff_nvcodec_headers
+
+  ffmpeg_config_options+=" --enable-openssl"
  build_ffmpeg
  sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -160,7 +160,7 @@ function InstallAndroidArmv7 {
    $strip="${toolchain_bin}/llvm-strip.exe"

    $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
-    $config += " --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
+    $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
    $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
    $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"

--- a/coin/provisioning/common/windows/install-jdk.ps1
+++ b/coin/provisioning/common/windows/install-jdk.ps1
@@ -45,19 +45,24 @@ if (Is64BitWinHost) {
    $version = "11.0.12"
    $arch = "x64"
    $sha1 = "135ffd1c350509729551876232a5354070732e92"
+    $installdir = "C:\Program Files\Java\jdk-$version"
+    $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
 } else {
-    $version = "8u144"
-    $arch = "i586"
-    $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
+    $version = "11.0.11.9"
+    $arch = "x86-32"
+    $sha1 = "a861e994208ee85bf83a76105f6858feeb6fbb33"
+    $installdir = "C:\Program Files\AdoptOpenJDK\jdk-$version-hotspot"
+    $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.11_9.msi"
 }

-$installdir = "C:\Program Files\Java\jdk-$version"
-
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
 # NOTE! Official URL is behind login portal. It can't be used whit this script instead it need to be fetched to $url_cache first
 # java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows
 # java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
-$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+if (Is64BitWinHost) {
+    $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+} else {
+    $javaPackage = "C:\Windows\Temp\jdk-$version.msi"
+}

 Write-Host "Fetching Java SE $version..."
 $ProgressPreference = 'SilentlyContinue'
@@ -65,7 +70,11 @@ Write-Host "...from local cache"
 Download $url_cache $url_cache $javaPackage
 Verify-Checksum $javaPackage $sha1

-Run-Executable "$javaPackage" "/s SPONSORS=0"
+if (Is64BitWinHost) {
+    Run-Executable "$javaPackage" "/s SPONSORS=0"
+} else {
+    Run-Executable "msiexec" "/quiet /i $javaPackage"
+}
 Remove "$javaPackage"

 Write-Host "Remove Java update from startup"
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -213,6 +213,7 @@ installPackages+=(net-tools)
 installPackages+=(bridge-utils)
 ## For debian building debian packages
 installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)
 installPackages+=(apt-cacher-ng)
 installPackages+=(devscripts)
 installPackages+=(piuparts)
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
 newgrp sbuild

 # Create chroot
-#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
+# For ubuntu 20.04
+echo "Create chroot for Ubuntu Focal"
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
+echo "Done creating chroot for Ubuntu Focal"

 # Update chroot
 sudo sbuild-update -udcar stable
-
+sudo sbuild-update -udcar focal



--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+# Get required deb files for sbuild to build qt debian packages for Ubuntu focal
+mkdir -p /home/qt/debian_packages
+cd /home/qt/debian_packages
+# Backported cmake 3.24
+wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-focal/cmake-3.24-deb.tar.gz
+tar xzf cmake-3.24-deb.tar.gz
+# get rest of ready made Ubuntu focal arm debian packages
+# so that sbuild can find those
+# QtWebEngine dependencies
+wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/arm64-focal/libuv1_1.43.0.tar.gz
+tar -xzf libuv1_1.43.0.tar.gz
+rm -rf libuv1_1.43.0.tar.gz
+wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/arm64-focal/nghttp2_1.43.0.tar.gz
+tar -xzf nghttp2_1.43.0.tar.gz
+rm -rf nghttp2_1.43.0.tar.gz
+wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/arm64-focal/nodejs_12.22.9.tar.gz
+tar -xzf nodejs_12.22.9.tar.gz
+rm -rf nodejs_12.22.9.tar.gz
+# get ICU
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt_56.1-1_arm64.deb
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt-dev_56.1-1_arm64.deb
+
+
+
+
+
+
--- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh
@@ -58,6 +58,7 @@ sudo zypper -nq install bison flex gperf \
        zlib-devel \
        libudev-devel \
        glib2-devel \
+        libopenssl-3-devel \
        freetype2-devel \
        fontconfig-devel \
        sqlite3-devel \
@@ -93,7 +94,7 @@ sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-devel
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel \
-         libgbm-devel Mesa-dri-devel
+         libgbm-devel Mesa-dri-devel vulkan-devel

 # qtwebengine, qtmultimedia+ffmpeg
 sudo zypper -nq install libva-devel
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -249,6 +249,9 @@ sudo dpkg --add-architecture i386
 installPackages+=(nfs-kernel-server)
 installPackages+=(net-tools)
 installPackages+=(bridge-utils)
+# For Debian packaging
+installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)

 echo "Running update for apt"
 waitLoop
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+# Setups sbuild environment
+
+tee ~/.sbuildrc << EOF
+##############################################################################
+# PACKAGE BUILD RELATED (additionally produce _source.changes)
+##############################################################################
+# -d
+\$distribution = 'stable';
+# -A
+\$build_arch_all = 1;
+# -s
+\$build_source = 1;
+# -v
+\$verbose = 1;
+# parallel build
+\$ENV{'DEB_BUILD_OPTIONS'} = 'parallel=8';
+##############################################################################
+# POST-BUILD RELATED (turn off functionality by setting variables to 0)
+##############################################################################
+\$run_lintian = 1;
+\$lintian_opts = ['-i', '-I'];
+\$run_piuparts = 0;
+\$piuparts_opts = ['--schroot', 'stable-amd64-sbuild', '--no-eatmydata'];
+\$run_autopkgtest = 0;
+\$autopkgtest_root_args = '';
+\$autopkgtest_opts = [ '--', 'schroot', '%r-%a-sbuild' ];
+
+##############################################################################
+# PERL MAGIC
+##############################################################################
+1;
+EOF
+
+# Add user group
+sudo sbuild-adduser $LOGNAME
+newgrp sbuild
+
+# Create chroot
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
+# For ubuntu 20.04
+echo "Create chroot for Ubuntu Focal"
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
+echo "Done creating chroot for Ubuntu Focal"
+
+# Update chroot
+sudo sbuild-update -udcar stable
+sudo sbuild-update -udcar focal
+
+
+
+
+
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
-
 #############################################################################
 ##
-## Copyright (C) 2021 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.
@@ -39,21 +38,24 @@
 ##
 #############################################################################

-# build cmake for the debian packgaes
-# Create chroot for Ubuntu focal
-#mk-sbuild --arch=amd64 --name=focal --debootstrap-mirror="http://archive.ubuntu.com/ubuntu/" --distro=ubuntu focal
-
+# Get required deb files for sbuild to build qt debian packages for Ubuntu focal
 mkdir -p /home/qt/debian_packages
 cd /home/qt/debian_packages
+# Backported cmake 3.24
 wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-focal/cmake-3.24-deb.tar.gz
 tar xzf cmake-3.24-deb.tar.gz
-#git clone git@gitlab.ics.com:qt6_packaging/tqtc/cmake.git
-#wget https://github.com/Kitware/CMake/releases/download/v3.24.3/cmake-3.24.3.tar.gz -O cmake_3.24.3.orig.tar.gz
-#dpkg-source -b cmake
-#sbuild --build-dep-resolver=aptitude -sAd focal -c focal-amd64 cmake_3.24.3-1~bpo1.dsc
-
-
-
-
-
-
+# get rest of ready made Ubuntu focal arm debian packages
+# so that sbuild can find those
+# QtWebEngine dependencies
+wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/amd64-focal/libuv1_1.43.0.tar.gz
+tar -xzf libuv1_1.43.0.tar.gz
+rm -rf libuv1_1.43.0.tar.gz
+wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/amd64-focal/nghttp2_1.43.0.tar.gz
+tar -xzf nghttp2_1.43.0.tar.gz
+rm -rf nghttp2_1.43.0.tar.gz
+wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/amd64-focal/nodejs_12.22.9.tar.gz
+tar -xzf nodejs_12.22.9.tar.gz
+rm -rf nodejs_12.22.9.tar.gz
+# get ICU
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt_56.1-1_amd64.deb
+wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt-dev_56.1-1_amd64.deb
--- 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
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	244fc45435	Update submodules on '6.6.0 in qt/qt5' Change-Id: I66682550e2e10f1d48f0d12f18d62418c0e52a92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-04 05:20:22 +00:00
Qt Submodule Update Bot	462345a443	Update submodules on '6.6.0 in qt/qt5' Change-Id: I14687fb8e4084f7d0c2150331db1d09150cd9858 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-02 17:24:10 +00:00
Simo Fält	43e1a3d2f5	COIN: Use Ubuntu Focal chroot instead of Debian stable We need to use older chroot to build debian packages. Pick-to: 6.6 dev Task-number: QTBUG-117120 Change-Id: I044e398324c380716b309dad5b087e97bc6688ab Reviewed-by: Toni Saario <toni.saario@qt.io>	2023-10-01 18:25:49 +03:00
Qt Submodule Update Bot	7e5f5266db	Update submodules on '6.6.0 in qt/qt5' Change-Id: I23fc73c5331db008857709fbbf03f76db52a912b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-01 15:25:44 +00:00
Elias Toivola	f548b71f7d	Fix FFmpeg nv-codec file SHA and cache External URL file SHA changed and the cache file didn't exist. Task-number: QTQAINFRA-5862 Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit `bbbe558077`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `710d6e5cb0`)	2023-10-01 15:25:40 +00:00
Simo Fält	f8f18afaa2	CI: Fix cmake debian package path for arm Pick-to: dev 6.6 Change-Id: Ib1ea0b7bec0e00b50c957ae0f530284ae32bbe9b Reviewed-by: Toni Saario <toni.saario@qt.io>	2023-10-01 15:25:33 +00:00
Qt Submodule Update Bot	15edd7b4f9	Update submodules on '6.6.0 in qt/qt5' Change-Id: I0fb49899126f2e455816f7e42e23df668e6118db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-28 20:30:35 +00:00
Qt Submodule Update Bot	118535d55b	Update submodules on '6.6.0 in qt/qt5' Change-Id: I0f2ce2f80a399944312fe21fb388859141e6d5af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-27 02:41:57 +00:00
Qt Submodule Update Bot	bdc4c02b1c	Update submodules on '6.6.0 in qt/qt5' Change-Id: Iecab4f25a5f250cd35fef23209fe41fdfb954352 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-21 21:35:57 +00:00
Allan Sandfeld Jensen	3e76115b8a	Add vulkan package to SLES Helps build vulkan support in qtbase, and vaapi support in qtwebengine Task-number: QTBUG-115722 Change-Id: If51bc6a91c69829313991bfa9172026ce54476f7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `b49729a50c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `9166555fb3`)	2023-09-20 20:38:56 +00:00
Nicholas Bennett	bec7d8ae9d	Docs: Make sure documentation tests run on QtAA integration Previously the dedicated documentation config was removed in favor of including ubuntu-22.04-documentation. Since then, that configuration lost the TestDocs flag. It now comes with ubuntu-22.04-documentation-x11-tests instead, so this change adds that configuration. Change-Id: I046f79aa8810ded6aa6dd07814ff43dd3fa2bbe8 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit `6fea315c0f`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `6146c70d06`)	2023-09-20 20:38:56 +00:00
Qt Submodule Update Bot	da6f809acc	Update submodules on '6.6.0 in qt/qt5' Change-Id: I80774a1100526a72f63a54a3f0a26bf135d6c03b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-20 16:24:48 +00:00
Jani Heikkinen	64cbeda777	Adjust submodule branches Change-Id: I4bd5af3cf68d4a0a1e566b6235c995c56f6fc142	2023-09-13 11:19:23 +03:00
Assam Boudjelthia	1890fc3f23	Android: Add missing ANDROID_EMULATOR param to Multi-ABI test target The Multi-ABI targets run a subset of Android tests but the target doesn't explicitly set the name of the Android emulator to run, so it was defaulting to Android 6 because the CI Android emulator runner script defaults to that. The latter is going change to be more explicit, so this needs to be explicit also. Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit `2e96d4eefa`)	2023-09-12 09:38:57 +00:00
Alexey Edelev	f654edcfc9	Enable building of ProtobufWellKnownTypes module on Android Point to the location of the host well-known .proto files using the QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR CMake cache variable. Change-Id: I53c6a76f28736c60d22a9d52e6ae79079b64772a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `4989ee9b24`) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2023-09-12 11:37:56 +02:00
Qt Submodule Update Bot	c04211bef4	Update submodules on '6.6 in qt/qt5' Change-Id: I18ff3a47745c3ec2d59769ad3478d4cfdadfec0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-12 05:50:11 +00:00
Piotr Wierciński	b347a64cee	wasm: Fix provisioning machine with correct version of Emscripten The SHA-1 hash was not properly updated after upgrading Emscripten from version 3.1.25 to 3.1.37. Change-Id: Iad2a8603ce6163545de432a35940c91ee47ffea8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit `4c3df86e21`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-09-10 20:12:16 +00:00
Alexandru Croitor	25f5d682ac	CMake: Remove unused variable Change-Id: I8f79797428226b376a21813c91c87b5bfe8b390b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `cbb50f2e0b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-09-08 07:01:31 +00:00
Artem Dyomin	0da5559016	Add openssl to ffmpeg linux builds We need ffmpeg+openssl to enable multimedia networking. We kept it disabled on linux since we had linking dependency. The related patch in QtMM resolves openssl symbols dynamicaly and address the mandatory dependency. Change-Id: Idad0618a5320ae32d50fe1f3866c4ffd1bf8f542 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit `7300099520`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-09-07 06:23:01 +00:00
Toni Saario	eb3f0e5ad8	Add Ubuntu 22 namespace build and doc tests to default precheck Change-Id: I42b1355406040fbf61339013294232c3f0a339fa Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `561f9e287b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-09-06 15:33:01 +00:00
Qt Submodule Update Bot	dd27c7396b	Update submodules on '6.6 in qt/qt5' Change-Id: Iccb05fadf6be58e5d62ca4f251525839379ce69c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-05 06:41:51 +00:00
Qt Submodule Update Bot	540e83e83c	Update submodules on '6.6 in qt/qt5' Change-Id: I811c8e26517d62da79bed01edb7bb8f79e7a54eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-01 18:55:48 +00:00
Qt Submodule Update Bot	d816d5198b	Update submodules on '6.6 in qt/qt5' Change-Id: Ibc5126df76dca3cae865dcb553c1c41c4b0cd458 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-08-31 01:35:27 +00:00
Simo Fält	932419ebb9	CI: Enable debian amd64 debian packaging config Pick-to: dev Change-Id: I4efcdb930edb6b42e1042316986e5fb11ca337f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2023-08-30 12:00:58 +00:00
Simo Fält	442f28b534	Provisioning: Install debian packaging dependencies to Ubuntu Pick-to: dev Change-Id: I320adf737c7ac9da45e27b30b385318f1d925905 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2023-08-30 12:00:56 +00:00
Qt Submodule Update Bot	ee432cd0e3	Update submodules on '6.6 in qt/qt5' Change-Id: I94567bc38d707b6eec6e7dc40c04a80be99530ba Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-08-29 19:40:26 +00:00
Qt Submodule Update Bot	669e16bb14	Update submodules on '6.6 in qt/qt5' Change-Id: Ic0670a26b663728f26b810806f7f288dcc83daad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-08-29 00:58:01 +00:00
Simo Fält	5b30b2f432	Provisioning: Copy backported .deb files for sbuild These are required to successfully build debian packages for Ubuntu Focal. Pick-to: dev Change-Id: I708f3716ba8d1251bfae22da325e8e27f0fb80fe Reviewed-by: Toni Saario <toni.saario@qt.io>	2023-08-28 10:24:58 +03:00
Simo Fält	00af6b857a	CI: Enable debian arm64 debian packaging config Pick-to: dev Change-Id: I15537eab53c6e879d22761a12b017f3aaab4f7ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2023-08-28 07:24:56 +00:00
Simo Fält	ef3fae89d3	Add qtdeclarative as recommended dependency for qtgrpc Pick-to: dev Change-Id: I311095a1da4f181662d2552692de02e1573e8d53 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2023-08-28 07:24:54 +00:00
Artem Dyomin	2fd6dfcf6a	Add nvcodec to the ffmpeg build The patch enables nvidia hardware encoders/decoders. It doesn't add new package dependencies, ffmpeg loads required functionality in runtime if nvidia drivers have been installed. The change is coming together with implementation of hw devices precheck in qtmultimedia. Change-Id: Id54a95b2bacf433950c7b50a42ff99136a143d98 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit `69c29b7584`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-08-26 07:11:10 +00:00
Qt Submodule Update Bot	753cbb9d04	Update submodules on '6.6 in qt/qt5' Change-Id: I9d38711b230c44e7f488a69fa21915b25ce2e8bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-08-24 14:32:01 +00:00
Matti Paaso	65dac8226a	Change Java 8 into Java 11 for Windows x86 Jenkins dropped Java 8 support and Windows x86 is still used in packaging and RTA. Change-Id: I001aacd38147a21944ecaa7223414226a6c500ff Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `28e1b89e42`) Reviewed-by: Matti Paaso <matti.paaso@qt.io>	2023-08-23 05:39:29 +00:00
Qt Submodule Update Bot	2d54b11406	Update submodules on '6.6 in qt/qt5' Change-Id: I6ae5f43fdd26ef5114a5cfc3618c5f3690f2eac4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-08-23 05:39:28 +00:00
Artem Dyomin	14ed5a5ad8	Disable vulkan and v4l2m2m for ffmpeg builds Vulkan: FFmpeg has a very draft support of vulkan in n5.x and n6.0, it's promised to be introduced with some working functionality in n6.1. We'll wait for 6.1, then test it. For now, let's get rid of the extra dependency. v4l2m2m: It's a prospective hw acceleration on linux, especially on embeddded platforms, but currently, in my experiments, it's not working with both QtMM and ffmpeg cmd line. Let's get rid of the not working codec. Hopefully, it'll be fixed in the future. Change-Id: I2468f84ae2ec54043d2db83f1a9c08be8e4f509d Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit `d16fb16c53`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-08-18 21:54:56 +00:00