Update submodules on '6.3 in qt/qt5'

Change-Id: Iff67ff909e5df94f212788fb842e7c33babe4169
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -11,7 +11,7 @@
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg
+	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
 	branch = 6.3

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}}']

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -9,7 +9,7 @@ Configurations:
     Platform dependency: 'Ubuntu-20.04-host'
     Features: ['Packaging', 'InsignificantTests', 'VMSize8']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
         'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
         "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'",
         "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -5,7 +5,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests']
     Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
+-
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Features: ['Sccache', 'MinimalStaticTests']
@@ -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'

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'

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'

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'

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'

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'

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']

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'

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'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -0,0 +1,48 @@
+Version: 2
+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']

coin/provisioning/common/linux/qnx_710.sh

@@ -89,6 +89,18 @@ sudo cp $aarch64le_toolchain $targetPath
 sudo cp $armv7le_toolchain $targetPath
 sudo cp $x8664_toolchain $targetPath
 cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
+# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
+# Download code-only package from https://www.iana.org/time-zones and follow README
+# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
+# package which contains it and update required info below
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
+targetFile="qnx_qemu_utils.tar.xz"
+targetFolder="$qemuTargetPath/local/misc_files"
+sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
 sudo chown -R qt:users "$targetPath"
 

coin/provisioning/common/linux/qnx_qemu_build_files/local/options

@@ -10,7 +10,7 @@ OPT_CRYPTODEV='no'
 DEF_OPT_CRYPTODEV='no'
 OPT_DATA_INODES='3000'
 DEF_OPT_DATA_INODES='3000'
-OPT_DATA_SIZE='60'
+OPT_DATA_SIZE='512'
 DEF_OPT_DATA_SIZE='60'
 OPT_EXTRA_DIRS='none'
 DEF_OPT_EXTRA_DIRS='none'

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom

@@ -11,3 +11,7 @@ PATH=__IFS_PATH__:/system/xbin
 
 [uid=0 gid=0 dperms=755 type=dir] var/share
 var/share/zoneinfo=usr/share/zoneinfo
+
+[uid=0 gid=0 dperms=755 type=dir] var/share/fonts
+var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/share/fonts=usr/share/fonts

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom

@@ -6,3 +6,7 @@ HOME=/home/root
 TZ=Europe/Oslo
 procmgr_symlink /data/var/share /usr/share
 procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime
+
+# fontconfig
+procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf
+procmgr_symlink /data/var/share/fonts /usr/share/fonts

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom

@@ -12,3 +12,9 @@
 # resource manager supports a -U option for switching to non-root.
 echo "---> Starting Filesystem event manager (fsevmgr)"
 STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__
+
+echo "---> Remove large fonts"
+rm -rf /data/var/share/fonts/NotoSansCJK*
+rm -rf /data/var/share/fonts/NotoSansMonoCJK*
+echo "---> Create fontconfig cache"
+fc-cache &

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom

@@ -19,10 +19,10 @@ lib/libicudata.so.67=usr/lib/libicudata.so.67
 lib/libicui18n.so.67=usr/lib/libicui18n.so.67
 lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
 lib/libEGL.so.1=usr/lib/libEGL.so.1
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.1=usr/lib/libfreetype.so.1
+lib/libfreetype.so.23=usr/lib/libfreetype.so.23
+lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1
 lib/libm.so.3=lib/libm.so.3
@@ -44,3 +44,8 @@ lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so
 
 # for inotify
 xbin/fsevmgr=sbin/fsevmgr
+
+# for fontconfig
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+xbin/fc-cache=bin/fc-cache
+xbin/fc-match=local/misc_files/fc-match

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"
 

coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh

@@ -72,6 +72,9 @@ sudo zypper -nq install p7zip
 # EGL support
 sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel
 
+# ICU
+sudo zypper -nq install libicu-devel libicu-suse65_1
+
 # gtk3 style for QtGui/QStyle
 sudo zypper -nq install gtk3-devel
 
@@ -82,9 +85,6 @@ sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel
 sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
          xcb-util-wm-devel xcb-util-renderutil-devel
 
-# ICU
-sudo zypper -nq install libicu-devel libicu-suse65_1
-
 # qtwebengine
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \

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"
 

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/80-install-chrome.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://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 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+set -ex
+
+# This script will install up-to-date google Chrome needed for Webassembly auto tests.
+
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+# Webassembly auto tests run requires latest Chrome. Let's use the latest stable one which means we can't cache this
+sudo zypper ar http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome
+
+# Add the Google public signing key
+externalUrl="https://dl.google.com/linux/linux_signing_key.pub"
+Download "$externalUrl" "/tmp/linux_signing_key.pub"
+sudo rpm --import /tmp/linux_signing_key.pub
+
+# Update the repo cache of zypper and install Chrome
+sudo zypper ref -f
+sudo zypper -nq install --no-confirm google-chrome-stable

coin/provisioning/qtci-macos-11-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

coin/provisioning/qtci-macos-11-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
-