Update submodules on '6.2.0' in qt/qt5

Change-Id: I3c8b4abbff31fa7f595da56e0238e3a8610431d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-07 15:36:54 +08:00 · 2021-09-14 08:14:44 +03:00 · 2021-09-13 14:11:47 +03:00 · 2021-09-13 10:17:27 +03:00 · 2021-09-13 07:10:06 +03:00 · 2021-09-12 02:40:01 +03:00
43 changed files with 99 additions and 85 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.2
+	branch = 6.2.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.2
+	branch = 6.2.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.2
+	branch = 6.2.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.2
+	branch = 6.2.0
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.2
+	branch = 6.2.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.2
+	branch = 6.2.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,14 +76,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -110,183 +110,183 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.2
+	branch = 6.2.0
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.2
+	branch = 6.2.0
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.2
+	branch = 6.2.0
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.2
+	branch = 6.2.0
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.2
+	branch = 6.2.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.2
+	branch = 6.2.0
 	status = addon
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -3,11 +3,15 @@ Configurations:
    -
      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
      Compiler: 'GCC'
+      Target os: 'INTEGRITY'
      Platform dependency: 'Ubuntu-20.04-host'
      Features: ['Sccache', 'DisableTests']
-      Configure arguments: '-DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64'
-      Environment variables: ['INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
-          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
+      Environment variables: [
+          'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
+          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
+          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
+          'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
          'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
          'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
-          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH']
+          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
+          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -10,7 +10,7 @@ Configurations:
        Features: ['Packaging', 'Sccache', 'DoNotRunTests']
        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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
        Environment variables: [
-            'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+            'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_gds=OFF',
            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
            ]

--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -2,6 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml,
    macos-developer-build-tests.yaml,
-    cmake_platforms_static_tests.yaml
+    cmake_platforms_static_tests.yaml,
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/provisioning/common/linux/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7.zip"
+urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
 urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
-SHA1_toolchainEs7="3c1edba781aa518e53e962cdb5fc5483aaa4991b"
+SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
 SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
 targetFolder="$HOME"
 appPrefix=""
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	6e42fc3e0a	Update submodules on '6.2.0' in qt/qt5 Change-Id: I3c8b4abbff31fa7f595da56e0238e3a8610431d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-14 08:14:44 +03:00
Qt Submodule Update Bot	fc0466cd53	Update submodules on '6.2.0' in qt/qt5 Change-Id: Id7f68d2fd346ff4a483879f7e2f2e0f6dfe160ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-13 14:11:47 +03:00
Jani Heikkinen	d14203d441	Fix M2M module branches Change-Id: Ib5f30b9b96af1bafba72775c3d8c55f898187b51 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2021-09-13 10:17:27 +03:00
Jani Heikkinen	d3859c14ee	Update submodules on '6.2.0' in qt/qt5 Change-Id: Ic1423e1f6582fa18c4cef70dad89fd9a9efa280f Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2021-09-13 07:10:06 +03:00
Qt Submodule Update Bot	c9408c8172	Update submodules on '6.2.0' in qt/qt5 Change-Id: I2919dfcb783d4eef8a9b51527ec741fa8a2f6d54 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-12 02:40:01 +03:00
Qt Submodule Update Bot	c5d8723bf2	Update submodules on '6.2.0' in qt/qt5 Change-Id: Ic2db19708421b63d2f12f152bbb397fce1887406 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-11 04:39:25 +03:00
Heikki Halmet	4b4264c7d5	Provisioning: Update the Integrity toolchain version Task-number: QTQAINFRA-3555 Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `f320433979`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-09-08 09:26:55 +03:00
Jani Heikkinen	e5495d93f6	Adjust submodule branches Change-Id: I57ff0bdb21eaa15434f223d1481be9dc862b841f	2021-09-08 08:00:58 +03:00
Qt Submodule Update Bot	833372c809	Update submodules on '6.2' in qt/qt5 Change-Id: I986062980c44c646e92924d94dc8092a1cd65726 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-07 19:25:16 +03:00
Jani Heikkinen	2fd650b973	Add '-DFEATURE_gds=OFF' as a non-qtbase configure argument for macOS packaging host We need to disable GDS feature to solve OpenSSL library linking issue Fixes: QTBUG-93759 Pick-to: dev Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>	2021-09-07 16:58:57 +03:00
Heikki Halmet	b94cc9cc28	Make Integrity significant Task-number: QTQAINFRA-4285 Change-Id: I131e6af26a28012228178192e60e2a91d33959fe Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-09-07 08:01:09 +03:00
Simo Fält	2fe9652422	COIN: Fix integrity target configure arguments Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `9385d5d687`) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2021-09-06 05:45:10 +00:00
Qt Submodule Update Bot	963b169394	Update submodules on '6.2' in qt/qt5 Change-Id: I9b6f54949bcafcf8026e51e799d2492dc3f4a317 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-04 00:05:41 +03:00
Kimmo Ollila	da33061d66	Add Integrity target for other modules QtDeclarative, QtImageFormats and QtShaderTools Change-Id: I24906d833d364a80025663928650f032a8618c22 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `dd24bc25c9`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2021-09-03 09:48:22 +03:00
Kimmo Ollila	1d7d4a7603	Add Integrity target for QtSvg Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `401ef8a8b3`) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2021-09-03 06:48:19 +00:00
Heikki Halmet	9fd1d19465	Add Insignificant flag for Integrity We will add new module targets for Integrity. Those are not tested during Qt5 integration. Let's remove the flag after we are sure that nothing will break on those new targets Change-Id: Ifdcecc869a931897e377281618dfce744353b47e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2021-09-03 09:48:13 +03:00
Simo Fält	433f106d31	Make Integrity platform config as a cross compile target While there was no target os value, COIN thinks that it is a normal desktop target. This causes the host and target artifacts being copied to wrong location. Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `b5c4effe7e`) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2021-09-03 09:48:09 +03:00
Qt Submodule Update Bot	4de7f2fd54	Update submodules on '6.2' in qt/qt5 Change-Id: Ibc0860c74a72a87dd3a6215649bc5cd756e4eaad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-03 07:37:54 +03:00