Update submodules on '6.3 in qt/qt5'

Change-Id: Iff67ff909e5df94f212788fb842e7c33babe4169 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
coin: Update provisioned qdoc, qtattributionsscanner binaries
2026-01-04 05:57:42 +08:00 · 2022-02-12 07:30:39 +00:00 · 2022-02-11 03:10:50 +00:00 · 2022-02-10 16:14:19 +00:00 · 2022-02-09 15:30:10 +00:00 · 2022-02-04 15:48:11 +00:00
92 changed files with 127 additions and 200 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -54,24 +54,17 @@ Configurations:
    Features: ['Sccache', 'DisableTests']
    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
-
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", "Insignificant"]
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: [
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
 -
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'Insignificant']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'InsignificantTests']
    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -80,7 +73,7 @@ Configurations:
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'Insignificant']
+    Features: ['Sccache', "DebugAndRelease"]
    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
@@ -88,7 +81,7 @@ Configurations:
 -
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'Insignificant']
+    Features: ['Sccache', "DebugAndRelease", 'InsignificantTests']
    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -96,17 +89,17 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Id: 'Windows10-MSVC2019-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
+    Id: 'Windows10_21H2-MSVC2019-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Features: ['Sccache', "DebugAndRelease"]
    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
-    Platform dependency: 'Windows10-MSVC2019-x64-host'
+    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
    Environment variables: [
        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
@@ -114,26 +107,11 @@ Configurations:
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
-
-    Id: 'Windows10_21H2-MSVC2019-x64-host'
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", "Insignificant"]
-    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
-
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant']
-    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON',
-        ]
 -
    Id: 'Windows11_21H2-MSVC2019-x64-host'
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", "Insignificant"]
+    Features: ['Sccache', "DebugAndRelease", "InsignificantTests"]
    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -142,7 +120,7 @@ Configurations:
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'InsignificantTests']
    Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
    Environment variables: [
        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -157,7 +135,7 @@ Configurations:
    Environment variables: [
        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc']
 -
-    Template: 'qtci-macos-11.0-x86_64-102'
+    Template: 'qtci-macos-11-x86_64-104'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
@@ -169,8 +147,8 @@ Configurations:
        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
        'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
 -
-    Id: 'Windows10-Mingw11-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
+    Id: 'Windows10_21H2-Mingw11-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache']
    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
@@ -179,30 +157,12 @@ Configurations:
        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
-
-    Id: 'Windows10_21H2-Mingw11-x64-host'
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-
-    Id: 'Windows10-LLVM-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw']
 -
    Id: 'Windows10_21H2-LLVM-x64-host'
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Clang'
    Features: ['Sccache']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR=C:\llvm-mingw']
 -
@@ -210,20 +170,20 @@ Configurations:
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'Clang'
    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
 -
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'Mingw'
    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -14,7 +14,7 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Template: 'qtci-macos-11.0-x86_64-102'
+    Template: 'qtci-macos-11-x86_64-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'MinimalStaticTests']
    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF'
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -1,12 +1,12 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -17,22 +17,10 @@ Configurations:
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
-    ]
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -43,22 +31,10 @@ Configurations:
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
-    ]
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -66,32 +42,6 @@ Configurations:
        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
    ]
-
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
-    ]
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'
-    ]
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Target os: 'Android_ANY'
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -10,18 +10,6 @@ Configurations:
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
    ]
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Target os: 'WebAssembly'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Target os: 'WebAssembly'
@@ -32,7 +20,7 @@ Configurations:
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
 -
    Template: 'qtci-macos-10.14-x86_64'
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -18,7 +18,7 @@ Configurations:
        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
    -
        Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11.0-x86_64-102'
+        Template: 'qtci-macos-11-x86_64-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -35,7 +35,7 @@ Configurations:
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11.0-x86_64-102'
+        Template: 'qtci-macos-11-x86_64-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -1,13 +1,6 @@
 Version: 2
 Module only: True
 Configurations:
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -16,7 +16,7 @@ Configurations:
    Platform dependency: 'RHEL-8.4-host'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -6,12 +6,6 @@ Configurations:
    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
    Features: ['UseLegacyInstructions']
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,11 +1,5 @@
 Version: 2
 Configurations:
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
-    Features: ['Packaging', UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
 -
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -1,3 +1,48 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+Include: [
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml
+    ]
+Configurations:
+-
+    Id: 'Windows10_21H2-Mingw11-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Compiler: 'Mingw'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
+-
+    Id: 'macos-latest-xcode-universal-packaging-build'
+    Template: 'qtci-macos-12-x86_64-102'
+    Compiler: 'Clang'
+    Target arch: 'x86_64-arm64'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+    Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
+        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang']
+-
+    Id: 'RHEL-8.4-host'
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
+    Environment variables: [
+        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc']
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
+        'ANDROID_EMULATOR=@x86AutomotiveEmulator']
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -42,9 +42,6 @@
 # This script will install emscripten needed by WebAssembly

 $version = "3.0.0"
-$versionNode = "14.15.5"
-$versionWinPython = "3.9.2-1"
-$versionJre = "8.152"

 # Make sure python is in the path
 Prepend-Path "C:\Python27"
@@ -56,11 +53,19 @@ cd $installLocationEmsdk
 .\emsdk install $version
 .\emsdk activate $version

-Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk"
-Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten"
-Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node\${versionNode}_64bit\bin\node.exe"
-Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python\${versionWinPython}_64bit\python.exe"
-Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java\${versionJre}_64bit"
+$versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1]
+$versionNode = $($Env:EMSDK_NODE -split ('node\\') -split ('_64bit'))[1]
+$versionJre = $($Env:EMSDK_JAVA_HOME -split ('java\\') -split ('_64bit'))[1]
+
+# Set these environment variables permanently.
+# Note! Using 'emsdk_env.bat --permanent' doesn't set these permanently
+Set-EnvironmentVariable "EMSDK" "$env:EMSDK"
+Set-EnvironmentVariable "EM_CONFIG" "$env:EM_CONFIG"
+Set-EnvironmentVariable "EMSDK_NODE" "$env:EMSDK_NODE"
+Set-EnvironmentVariable "EMSDK_PYTHON" "$env:EMSDK_PYTHON"
+# In this case JAVA_HOME is the one emsdk install/activate set.
+# We need to use EMSDK_JAVA_HOME so that we don't override JAVA_HOME which comes from install-jdk.ps1
+Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$env:JAVA_HOME"
 Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk;$installLocationEmsdk\node\${versionNode}_64bit\bin;$installLocationEmsdk\upstream\emscripten;$PATH"
 Add-Path "$env:EMSDK_PATH"

--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh
@@ -48,9 +48,8 @@ set -e
 "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-version="52538a9d3d1ba10c638441666f8efbc78ba0b347"
-sha1="13614b273994547876a19d46348fc3a3e86481be"
+version="836becf90211c483d3d65987914c9fd962644be9"
+sha1="ef8c886480b57dfc799c7c2dd71ed859787f94a8"
 url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
 url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"

--- a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh
@@ -56,4 +56,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2
--- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh
@@ -43,10 +43,9 @@ set -ex

 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.5.1"
+version="13.2"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517"
+sha1="b3a0b597435cfbc5c09ad5772cf7313c87032252"

 InstallCommandLineTools $url $url $sha1 $packageName $version
-
--- a/coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh
--- 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	3af2d458dd	Update submodules on '6.3 in qt/qt5' Change-Id: Iff67ff909e5df94f212788fb842e7c33babe4169 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-02-12 07:30:39 +00:00
Topi Reinio	bdb72da050	coin: Update provisioned qdoc, qtattributionsscanner binaries Latest qdoc introduced a new command (\qmlvaluetype) used in qtdeclarative documentation, as well as other fixes and improvements. Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit `69b329a55f`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-11 03:10:50 +00:00
Assam Boudjelthia	322f6b1f04	Update tqtc-android-automotive targets and add test target The module is android specific and thus tests need to be disabled for platforms other than Android Automotive. Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `69536e4b45`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-10 16:14:19 +00:00
Qt Submodule Update Bot	57451734dc	Update submodules on '6.3 in qt/qt5' Change-Id: Iddbbfd4f3b9b2700060d52903b9fb83bee032ea8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-02-09 15:30:10 +00:00
Heikki Halmet	ecc9f2f425	Remove old Windows 10 targets Windows 10 21H2 is now significant for all targets Task-number: QTQAINFRA-4539 Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit `ac2bdfb93a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-04 15:48:11 +00:00
Heikki Halmet	75a52c9eec	Make Win 10 21H2 Environment variables to match with the old Win 10 Fix few differencies. E.g. Conan env variables are missing Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `0e641142c1`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-04 15:48:05 +00:00
Heikki Halmet	51752c6b7d	Set correct Emscripten environment variables Needed environment variables are set during emsdk installation when installation is done using emsdk.git. But those are not set as permanently. To have correct values we need to get them from install environment and set them permanently for build environment. Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `88cde9e500`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-04 11:26:17 +00:00
Heikki Halmet	32a225b398	Upgrade Xcode and Command Line Tools version to 13.2 Xcode 13.2 works only in macOS 11.3/12.0 or newer Task-number: QTQAINFRA-4607 Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `72997d7039`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-04 13:26:10 +02:00
Heikki Halmet	e954954e99	Provisioning: Start using latest macOS 11 version 11.6 New tier 1 image's name format is qtci-macos-11-x86_64 Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit `1865d70ef8`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-04 13:26:03 +02:00
Alexandru Croitor	4a4eac6e65	CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLES BUILD_EXAMPLES was the old way to disable building examples, which is not used anymore. This should remove the warning about an unused BUILD_EXAMPLES variable. Fixes: COIN-762 Change-Id: Icf88d617e564939bcff5047f83d029e93df16401 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit `ec6e186d10`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-03 09:38:05 +00:00
Heikki Halmet	00252d11c7	Make Windows 10 21H2 significant Task-number: QTQAINFRA-4600 Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `279841383d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-01 03:58:26 +00:00
Heikki Halmet	e00ab6299e	Change Windows 11 targets Insignificant flag to cover only autotests Task-number: QTQAINFRA-4673 Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `10897d6514`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-01 03:58:25 +00:00