Update LA 4.4.1

Task-number: QTBUG-101714 Pick-to: dev 6.3 6.2 5.15 Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
Update submodules on '6.3.0 in qt/qt5'
2025-12-29 19:35:37 +08:00 · 2022-04-06 17:42:40 +02:00 · 2022-04-06 15:42:30 +00:00 · 2022-04-06 15:42:18 +00:00 · 2022-03-24 11:40:32 +00:00 · 2022-03-23 06:36:25 +02:00
89 changed files with 2015 additions and 1291 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.3
+	branch = 6.3.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,189 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.3
+	branch = 6.3.0
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.3
+	branch = 6.3.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.3
+	branch = 6.3.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.3
+	branch = 6.3.0
 	status = preview
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@
 # 3.16 is the absolute minimum though.
 cmake_minimum_required(VERSION 3.16...3.20)

+
+# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
+set(QT_SUPERBUILD TRUE)
+
 # Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
 set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
 include("${__qt6_qtbase_src_path}/.cmake.conf")
@@ -37,7 +41,6 @@ include(ECMOptionalAddSubdirectory)
 if (NOT QT_BUILD_STANDALONE_TESTS)
    set(QT_NO_CREATE_TARGETS TRUE)
 endif()
-set(QT_SUPERBUILD TRUE)

 # Get submodule list if not already defined
 if(NOT QT_BUILD_SUBMODULES)
--- a/LICENSE.QT-LICENSE-AGREEMENT
+++ b/LICENSE.QT-LICENSE-AGREEMENT
--- a/coin/instructions/coin_qt_build_docs.yaml
+++ b/coin/instructions/coin_qt_build_docs.yaml
@@ -0,0 +1,33 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to generate docs.
+  - type: ExecuteCommand
+    command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
+  - type: ExecuteCommand
+    command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
+  - type: UploadArtifact
+    archiveDirectory: '{{.BuildDir}}/doc'
+    transferType: UploadModuleDocumentation
+    maxTimeInSeconds: 1800
+    maxTimeBetweenOutput: 1800
+enable_if:
+  condition: property
+  property: features
+  contains_value: "Documentation"
--- a/coin/instructions/coin_qt_build_template.yaml
+++ b/coin/instructions/coin_qt_build_template.yaml
@@ -0,0 +1,4 @@
+type: Group
+instructions:
+  - !include "{{qt/qt5}}/coin_qt_configure.yaml"
+  - !include "{{qt/qt5}}/coin_qt_build_docs.yaml"
--- a/coin/instructions/coin_qt_configure.yaml
+++ b/coin/instructions/coin_qt_configure.yaml
@@ -0,0 +1,16 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: MakeDirectory
+    directory: .git
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -6,54 +6,7 @@ accept_configuration:

 instructions:
  Build:
-    - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-    - type: MakeDirectory
-      directory: .git
-    - type: SetBuildDirectory
-      directory: "{{.SourceDir}}"
-    - type: ChangeDirectory
-      directory: "{{.BuildDir}}"
-    - type: ExecuteCommand
-      command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
-      executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-      maxTimeInSeconds: 6000
-      maxTimeBetweenOutput: 1200
-      userMessageOnFailure: >
-        Failed to call cmake.
-
-    - type: Group
-      instructions:
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to build sources.
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to generate docs.
-        - type: ExecuteCommand
-          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
-        - type: ExecuteCommand
-          command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
-        - type: UploadArtifact
-          archiveDirectory: '{{.BuildDir}}/doc'
-          transferType: UploadModuleDocumentation
-          maxTimeInSeconds: 1800
-          maxTimeBetweenOutput: 1800
-      enable_if:
-        condition: property
-        property: features
-        contains_value: "Documentation"
+    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"

  Test:
    - type: EnvironmentVariable
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -9,21 +9,6 @@ Include: [
    macos.yaml
    ]
 Configurations:
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
@@ -34,7 +19,7 @@ Configurations:
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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 -DCMAKE_AUTOGEN_VERBOSE=ON'
+    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 -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
 -
    Id: 'OpenSUSE-15.3-host'
    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
@@ -43,11 +28,6 @@ Configurations:
    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
    Environment variables: [
        'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc']
-
-    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    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'
 -
    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
    Compiler: 'GCC'
@@ -64,7 +44,7 @@ Configurations:
 -
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'InsignificantTests']
+    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}}\.. -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',
@@ -81,7 +61,7 @@ Configurations:
 -
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'InsignificantTests']
+    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}}\.. -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',
@@ -111,7 +91,7 @@ Configurations:
    Id: 'Windows11_21H2-MSVC2019-x64-host'
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", "InsignificantTests"]
+    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 -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',
@@ -120,7 +100,7 @@ Configurations:
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'InsignificantTests']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
    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',
@@ -169,7 +149,7 @@ Configurations:
    Id: 'Windows11_21H2-LLVM-x64-host'
    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'Clang'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['Sccache']
    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']
--- a/coin/platform_configs/linux_android_tests.yaml
+++ b/coin/platform_configs/linux_android_tests.yaml
@@ -0,0 +1,16 @@
+Version: 2
+Configurations:
+-
+    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_INSTALL_DIR={{.InstallDir}}/target',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
+        'ANDROID_EMULATOR=@emulator_x86_api_23']
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -4,20 +4,7 @@ Include: [
    cmake_platforms_static_tests.yaml,
    macos-developer-build-tests.yaml,
    integrity.yaml,
-    ios-tests.yaml
+    ios-tests.yaml,
+    linux_android_tests.yaml
 ]
-Configurations:
-
-    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_INSTALL_DIR={{.InstallDir}}/target',
-        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
-
+Configurations: []
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -3,6 +3,7 @@ Include: [
    cmake_platforms.yaml,
    macos-developer-build-tests.yaml,
    integrity.yaml,
-    cmake_platforms_static_tests.yaml
+    cmake_platforms_static_tests.yaml,
+    linux_android_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml
+    integrity.yaml,
+    linux_android_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtlanguageserver.yaml
+++ b/coin/platform_configs/qtlanguageserver.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml
+    integrity.yaml,
+    linux_android_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml
+    integrity.yaml,
+    linux_android_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml
+    integrity.yaml,
+    linux_android_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -5,6 +5,11 @@ Include: [
    cmake_platforms_target_android_host_windows.yaml
    ]
 Configurations:
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'Documentation', 'TestDocs']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
 -
    Id: 'Windows10_21H2-Mingw11-x64-host'
    Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -40,7 +45,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    Features: ['Sccache', 'AndroidTestRun', 'Insignificant']
    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',
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -136,6 +136,6 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86"  \
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"

-echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-23;google_apis;x86" -c 2048M -f
+echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -k "system-images;android-23;google_apis;x86" -c 2048M -f
 # Purely informative, show the list of avd devices
 ./avdmanager list avd
--- a/coin/provisioning/common/linux/install-git.sh
+++ b/coin/provisioning/common/linux/install-git.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2022 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$
+##
+#############################################################################
+
+# This script install git from sources.
+# Requires GCC and Perl to be in PATH.
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="2.31.1"
+officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
+targetFile="/tmp/git-$version.tar.gz"
+sha="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+sourceDir="/tmp/git-$version-source"
+mkdir $sourceDir
+tar -xzf "$targetFile" -C $sourceDir
+
+cd "$sourceDir/git-2.31.1"
+installDir="$HOME/git"
+make configure
+./configure --prefix=$installDir
+make all
+sudo make install
+
+SetEnvVar "PATH" "\"$installDir/bin:\$PATH\""
+
+$installDir/bin/git --version
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/coin/provisioning/common/linux/qnx_710.sh
@@ -102,6 +102,11 @@ if [ ! -d "$targetFolder" ]; then
 fi
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

+# Add ssl certificates. Expects Ubuntu 20.04 LTS with ca-certificates package installed
+cp -R /usr/share/ca-certificates "$targetFolder"
+mkdir -p "$targetFolder/etc/ssl/certs"
+cp -PR /etc/ssl/certs/* "$targetFolder/etc/ssl/certs"
+
 sudo chown -R qt:users "$targetPath"

 # Verify that we have last files in tars
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts
@@ -0,0 +1,11 @@
+# Need to add all testserver names statically
+# as current Docker uses Multicast DNS (mDNS) (avahi)
+# Which does not work with QNX qemu
+172.31.1.1  apache2     apache2.test-net.qt.local
+172.31.1.1  squid       squid.test-net.qt.local
+172.31.1.1  vsftpd      vsftpd.test-net.qt.local
+172.31.1.1  ftp-proxy   ftp-proxy.test-net.qt.local
+172.31.1.1  danted      danted.test-net.qt.local
+172.31.1.1  cyrus       cyrus.test-net.qt.local
+172.31.1.1  echo        echo.test-net.qt.local
+172.31.1.1  iptables    iptables.test-net.qt.local
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf
@@ -0,0 +1,2 @@
+search test-net.qt.local
+nameserver 172.31.1.1
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom
@@ -15,3 +15,11 @@ 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
+
+var/etc/hosts=local/misc_files/etc/hosts
+var/etc/resolv.conf=local/misc_files/etc/resolv.conf
+var/etc/nsswitch.conf=etc/nsswitch.conf
+
+[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
+var/share/ca-certificates=local/misc_files/ca-certificates
+var/etc/ssl/certs=local/misc_files/etc/ssl/certs
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom
@@ -18,3 +18,8 @@ rm -rf /data/var/share/fonts/NotoSansCJK*
 rm -rf /data/var/share/fonts/NotoSansMonoCJK*
 echo "---> Create fontconfig cache"
 fc-cache &
+
+# Add default route so QNX knows where to send
+# requests for unknown network
+echo "---> Add default route"
+route add default 172.31.1.1
--- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom
+++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom
@@ -49,3 +49,8 @@ xbin/fsevmgr=sbin/fsevmgr
 lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
 xbin/fc-cache=bin/fc-cache
 xbin/fc-match=local/misc_files/fc-match
+
+# network
+lib/libssl.so=usr/lib/libssl.so
+xbin/nslookup=usr/bin/nslookup
+xbin/curl=usr/bin/curl
--- a/coin/provisioning/common/macos/install-git.sh
+++ b/coin/provisioning/common/macos/install-git.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+brew install git
--- a/coin/provisioning/common/unix/install-openssl.sh
+++ b/coin/provisioning/common/unix/install-openssl.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -48,11 +48,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-version="1.1.1k"
+version="1.1.1m"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="39d424c4411e45f1570073d7a71b1830b96007ca"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
--- a/coin/provisioning/common/unix/openssl_for_android.sh
+++ b/coin/provisioning/common/unix/openssl_for_android.sh
@@ -2,7 +2,7 @@

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

-version="1.1.1k"
+version="1.1.1m"
 : ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
 # Source built requires GCC and Perl to be in PATH.
 exports_file="/tmp/export.sh"
@@ -66,7 +66,7 @@ fi
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="39d424c4411e45f1570073d7a71b1830b96007ca"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -82,11 +82,11 @@ PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '

 if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21_darwin.tar.gz"
-    sha="6e3e48441ff58596f25bc27fdc05ae43e5a7581d"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
+    sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
 else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
-    sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
+    sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
 fi
 targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
 DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -51,16 +51,17 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

-$version = "1.1.1k"
+$version = "1.1.1m"
+$ndk_version = "r22b"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
-$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
-$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
+$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
+$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
+$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
 $destination = "C:\Utils\openssl-android-master"
-$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
+$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"

 # msys unix style paths
-$ndkPath = "/c/Utils/Android/android-ndk-r22b"
+$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
 if ((Test-Path $prebuilt_url)) {
@@ -69,7 +70,8 @@ if ((Test-Path $prebuilt_url)) {
    Extract-7Zip $prebuilt_zip C:\Utils
    Remove $prebuilt_zip
 } else {
-    Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+    # openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
+    Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
    Verify-Checksum $zip $sha1

    Extract-7Zip $zip C:\Utils\tmp
--- a/coin/provisioning/common/windows/openssl-arm64.ps1
+++ b/coin/provisioning/common/windows/openssl-arm64.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -56,9 +56,9 @@
 # nmake install
 #################################################################################################################################################

-$version = "1_1_1_k"
+$version = "1_1_1_m"
 $url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
-$sha1 = "e31f6d3a4af225f9314830aad099bb8e5d4a7ff1"
+$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02"
 $installFolder = "C:\openssl_arm64"
 $zip_package = "C:\Windows\Temp\$version.zip"

--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,7 +42,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "1_1_1k"
+$version = "1_1_1m"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"

@@ -53,7 +53,7 @@ if (Is64BitWinHost) {
    $installFolder = "C:\openssl"
    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
+    $sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"

    Write-Host "Fetching from URL ..."
    Download $externalUrl $internalUrl $packagex64
@@ -80,7 +80,7 @@ if (Is64BitWinHost) {

 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
+$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a"

 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86
--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh
@@ -1,45 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/07-qnx_710.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/07-qnx_710.sh
@@ -1,45 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
@@ -84,6 +89,9 @@ installPackages+=(python2-devel python2-pip)
 # Python 3 with python-devel, pip and virtualenv
 installPackages+=(python36)
 installPackages+=(python36-devel)
+# Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3
+installPackages+=(python38)
+installPackages+=(python38-devel)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)
@@ -156,6 +164,8 @@ sudo dnf -y module install nodejs:12
 # working, but we can use installed pip
 sudo pip3 install --upgrade pip
 sudo pip3 install virtualenv wheel
+# Just make sure we have virtualenv to run with python3.8 -m virtualenv
+python3.8 -m pip install virtualenv --user

 sudo /usr/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/07-qnx_710.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/07-qnx_710.sh
@@ -1,45 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
@@ -118,6 +118,9 @@ sudo zypper -nq update open-vm-tools
 # RTA tests requires python 2 xml modules
 sudo zypper -nq install python-xml

+# Tools to build Git
+sudo zypper -nq install autoconf libcurl-devel libexpat-devel
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -133,6 +133,7 @@ installPackages+=(libgl1-mesa-glx)
 installPackages+=(libgl1-mesa-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -151,6 +151,7 @@ installPackages+=(libegl-dev)
 installPackages+=(libglvnd-dev)
 installPackages+=(libgles2-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
@@ -55,6 +55,9 @@ sudo zypper -nq install libspeechd-devel
 # make
 sudo zypper -nq install make

+# Tools to build Git
+sudo zypper -nq install autoconf libcurl-devel libexpat-devel
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
--- a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"
--- a/coin/provisioning/qtci-macos-11.0-x86_64/81-bluetooth.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/81-bluetooth.sh
--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"
--- a/coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1
+++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-msvc2019.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
--- 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
Jani Heikkinen	1734139bf4	Update LA 4.4.1 Task-number: QTBUG-101714 Pick-to: dev 6.3 6.2 5.15 Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932 Reviewed-by: Antti Kokko <antti.kokko@qt.io> Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>	2022-04-06 17:42:40 +02:00
Qt Submodule Update Bot	7bd9550eb8	Update submodules on '6.3.0 in qt/qt5' Change-Id: I03e07f99a3972d8dbc33772792e4f8503af49ef6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-04-06 15:42:30 +00:00
Antti Kokko	8b9d185ad3	Coin: Remove 'Packaging' feature from target which is 'Insignificant' 'Insignificant' feature should not be used with target that has 'Packaging' feature enabled. Current: 'Packaging, Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure' After this change: 'Sccache, AndroidTestRun, Insignificant, AbortTestingOnFirstFailure' Pick-to: 6.3 dev Change-Id: I0662885db80ed9ca93d5c66902029665382a75fa Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2022-04-06 15:42:18 +00:00
Qt Submodule Update Bot	28fa31c441	Update submodules on '6.3.0 in qt/qt5' Change-Id: I546956f2f585861c9cf3f6f317acd0b7f501b8b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-24 11:40:32 +00:00
Heikki Halmet	686481f48c	Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m Used OpenSSL source package 1.1.1m was changed little bit. All ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf file Pick-to: dev 6.3 6.2 Task-number: QTQAINFRA-4864 Task-number: QTBUG-101863 Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>	2022-03-23 06:36:25 +02:00
Jani Heikkinen	4ec029b83f	Adjust submodule branches Change-Id: I8b52e597dd251a76b7b85cd344e6611d47f35d9b	2022-03-21 07:41:44 +02:00
Fabian Kosmale	0420b8e8d2	Set QT_SUPERBUILD early That will allow qtbase's .cmake.conf to check whether it is meant to be used in a superbuild or only for qtbase. Task-number: QTBUG-101640 Change-Id: I035c86f32497004cc1b8441456604106bacadad4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `14e486a8c4`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-20 10:29:12 +00:00
Assam Boudjelthia	9362c7ec43	Add Android tests to Qt modules - part 1 This enables testing for Android for the modules: qtdeclarative, qtsvg, qtshadertools, qtimageformats, qtlanguageserver. Also replace the qtbase Android test target with linux_android_tests.yaml. Task-number: QTBUG-88846 Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `523eb8e1ea`) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2022-03-19 11:27:32 +02:00
Qt Submodule Update Bot	05b49c7b60	Update submodules on '6.3 in qt/qt5' Change-Id: I3494598d30e78331006ffbe417355f1892dd20cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-18 04:57:55 +00:00
Heikki Halmet	98f696ce30	Fix Openssl android installation Current provisioning installation is broken. Current package replaced the old openssl-android-master-1.1.1m.zip and shasum changed. Task-number: QTQAINFRA-4848 Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `96fe74b540`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-17 11:28:30 +00:00
Heikki Halmet	ed8d1c76ae	Provisioning: Run msvc 2019 update at the beginning of provisioning When script was run with prefix 99 the installation process wasn't finished before machine got rebooted. Moving the script at beginning of provisioning seems to help with the situation. This is not a proper fix but the best we have right now. We can change this later if/when we find the root cause for this. Task-number: QTQAINFRA-4813 Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit `1597f43512`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-17 11:28:27 +00:00
Pasi Petäjäjärvi	ba761fab29	CI: Add ssl certificates for QNX Expects Ubuntu 20.04 LTS with ca-certificates package installed Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `339a47b4ed`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-14 19:06:55 +00:00
Pasi Petäjäjärvi	0ad4b8a794	CI: Add network autotests support for QNX Add regular UNIX network related files to configure used test network based around QEMU and docker services. IP address 172.31.1.1 is bridge interface address in host which QNX tool mkqnximage set (hard coded intool, cannot be changed). Docker service hostnames are configured statically as mDNS does not work from QEMU. Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `477877352a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-14 19:06:49 +00:00
Pasi Petäjäjärvi	28d8ebdd5b	CI: Remove installation of QNX toolchain from linux platforms These linux platforms are not used when building for QNX Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `c4869161b6`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-14 19:06:37 +00:00
Qt Submodule Update Bot	c4d99abe5e	Update submodules on '6.3 in qt/qt5' Change-Id: I4dab3397fa5afb657444944f6f45b33735e1cf4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-14 18:43:35 +00:00
Qt Submodule Update Bot	6e4d0b7e87	Update submodules on '6.3 in qt/qt5' Change-Id: I1135c2abec5cd8113e77ce48bd9f8530cfa0fe6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-12 11:38:46 +00:00
Assam Boudjelthia	78925a27d1	Coin: Fix Documentation target on tqtc/android-automotive The Documentation target in tqtc-android-automotive.yaml has -DFEATURE_cxx20=ON flag which is not present in the main cmake_platforms.yaml on this branch, this might have been the cause for failing docs build under qtinterfaceframework. Change-Id: Ife84d424673cd7ccf82d0046839ebefa71305f0e Reviewed-by: Simo Fält <simo.falt@qt.io>	2022-03-10 19:29:57 +00:00
Assam Boudjelthia	6aaa6ecfe2	Rename the Android emulator to be more descriptive Because we want to add Android 12 emulator for testing, it's important to have a more descriptive emulator name. For this one, it includes api_23 part. Task-number: QTBUG-88846 Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `a4cc949b8d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-10 19:29:57 +00:00
Qt Submodule Update Bot	298627d025	Update submodules on '6.3 in qt/qt5' Change-Id: I161936a7d33f66efd84a17b280f26355905ba82f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-10 15:54:11 +00:00
Toni Saario	e76d47cae9	Update git Older git version does not allow fetching single specific sha1. Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `a2393b5882`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-08 08:56:51 +00:00
Simo Fält	cd944bec30	Provisioning: Make sure one can call virtualenv as module with python3.8 This will fix qtinterfaceframework's config test. Change-Id: Ifd2f52e27d31f140402d98861339ef5f7b253c23 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit `e1f18be950`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-07 20:23:58 +00:00
Qt Submodule Update Bot	0946334a2b	Update submodules on '6.3 in qt/qt5' Change-Id: Ib13bff9dea1a7274de2653342465efd79bcf11b2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-05 10:46:26 +00:00
Simo Fält	b229146083	Provisioning: Install additional Python 3.8 for RHEL 8.4 Change-Id: Ic9893505d3805bcc3cbed972a95ce4a756e4c32a Reviewed-by: Dominik Holland <dominik.holland@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `171f29f091`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-04 22:01:53 +00:00
Qt Submodule Update Bot	62d5a030a9	Update submodules on '6.3 in qt/qt5' Change-Id: I3737dc748e232a6f13e782cdebcbe6ebbb296a53 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-03-03 17:18:06 +00:00
Alexandru Croitor	4e2f44f06c	coin: Split top-level build instructions Makes it a bit cleaner to follow. Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `a9c9418c8a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-02 16:38:40 +00:00
Jani Heikkinen	8f6de37d2b	Update LICENSE.QT-LICENSE-AGREEMENT Newest version is 4.4 so update it in the git as well Task-number: QTBUG-98971 Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io> Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io> (cherry picked from commit `cbeea07854`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-03-01 08:11:29 +00:00
Assam Boudjelthia	3ed9fa8a37	Mark QtAA Android test as insignificant until proven to work Make sure this doesn't block the repo, untill we have the whole Android Automotive pipeline working. Change-Id: I1aaef98cb724c8e299b2adacce36d8e3f786b432 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `2fd91cfe5d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-21 09:48:16 +00:00
Assam Boudjelthia	7c0540fc10	Add Documentation tatget to tqtc-android-automoitve Amends `69536e4b45`. Fixes: QAA-1026 Change-Id: Ieed387fb20ec4ebf1a4fbd2633da9c9e98b0a60b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `c36ce3dd49`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-21 09:48:08 +00:00
Heikki Halmet	1239512b38	Add passing targets as significant There is still autotests failures in one Windows 11 target Task-number: QTQAINFRA-4673 Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit `6cea45bfb8`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-18 19:21:21 +00:00
Volker Hilsheimer	344253220f	Prune Linux configurations in CI Remove the various FEATURE_xxx=off configurations, we don't support them and if we break stuff, then those issues are easily fixed after the fact and users relying on those combinations can provide patches. Most of them are obsolete with Qt 6 anyway, as users can just not link against QtGui or QtWidgets. Also remove the -no-opengl configuration, with RHI it's mostly irrelevant as there is very little Qt code outside of RHI that calls OpenGL APIs. Combine the various other configurations into a single configuration and remove subtle variations. Change-Id: Ia35713fc7373d54b82a11be14e2272ff011a51ab Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit `2e4d6af574`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-17 13:57:47 +00:00
Heikki Halmet	9fd8a4a687	Change DBUILD_EXAMPLES to DQT_BUILD_EXAMPLES for Windows 11 Change-Id: I93f5c80d78b5085317cfb7446cb21e231b9b5a24 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>	2022-02-16 18:48:46 +00:00
Heikki Halmet	13abc96385	Move bluetooth script under correct platform folder Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit `3f263aa742`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-16 18:48:06 +00:00
Heikki Halmet	a7fed578ed	Provisioning: Update OpenSSL to version 1.1.1m Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `8732165461`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-02-16 18:47:59 +00:00