Update submodules on '6.2.1 in qt/qt5'

Change-Id: Id26057487c482d148f1f112c1201a454609b424b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-30 20:05:43 +08:00 · 2021-10-26 03:07:20 +00:00 · 2021-10-21 14:55:29 +00:00 · 2021-10-20 13:58:53 +00:00 · 2021-10-19 12:45:27 +03:00 · 2021-10-13 08:14:05 +03:00
51 changed files with 294 additions and 101 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.2
+	branch = 6.2.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.2
+	branch = 6.2.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.2
+	branch = 6.2.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.2
+	branch = 6.2.1
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.2
+	branch = 6.2.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.2
+	branch = 6.2.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,14 +76,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -110,183 +110,183 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.2
+	branch = 6.2.1
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.2
+	branch = 6.2.1
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.2
+	branch = 6.2.1
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.2
+	branch = 6.2.1
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.2
+	branch = 6.2.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.2
+	branch = 6.2.1
 	status = addon
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -151,7 +151,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -162,7 +162,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -173,5 +173,5 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Sccache', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -8,7 +8,7 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
    Template: 'qtci-windows-10-x86_64-52'
@@ -20,7 +20,7 @@ Configurations:
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_pkg_config=OFF']
 -
    Template: 'qtci-macos-10.14-x86_64'
@@ -31,5 +31,5 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--- 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/cmake_toolchain_files/integrity_toolchain.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake
@@ -0,0 +1,96 @@
+#generic
+set(CMAKE_SYSTEM_NAME Integrity)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_CROSSCOMPILING True)
+
+set(TARGET_ROOT_PATH "/home/qt/integrity_toolchain/hlos_dev_boot")
+set(CMAKE_BUILD_TYPE "Release")
+
+set(CMAKE_C_COMPILER cxintarm64)
+set(CMAKE_CXX_COMPILER cxintarm64)
+set(CMAKE_ASM_COMPILER cxintarm64)
+
+set(EGL_FOUND True)
+set(UNIX True)
+
+set (CMAKE_C_COMPILE_FEATURES c_std_99)
+set (CMAKE_CXX_COMPILE_FEATURES
+cxx_alias_templates
+cxx_alignas
+cxx_alignof
+cxx_attributes
+cxx_auto_type
+cxx_constexp
+cxx_decltype
+cxx_delegating_constructors
+cxx_explicit_conversions
+cxx_extern_templates
+cxx_inheriting_constructors
+cxx_lambdas
+cxx_noexcept
+cxx_nonstatic_member_init
+cxx_nullptr
+cxx_override
+cxx_range_for
+cxx_raw_string_literals
+cxx_reference_qualified_functions
+cxx_rvalue_references
+cxx_static_assert
+cxx_std_17
+cxx_thread_local
+cxx_unicode_literals
+cxx_uniform_initialization
+cxx_unrestricted_unions
+cxx_variadic_macros
+cxx_variadic_templates)
+
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+set(CMAKE_FIND_ROOT_PATH ${TARGET_ROOT_PATH})
+
+#base
+set(CMAKE_C_FLAGS  "-bsp $ENV{INTEGRITY_BSP} -os_dir $ENV{INTEGRITY_DIR} -non_shared -startfile_dir=$ENV{INTEGRITY_DIR}/libs/$ENV{INTEGRITY_BSP}/$ENV{INTEGRITY_BUILD_TARGET} --rtos_library_directory=libs/$ENV{INTEGRITY_BSP}/$ENV{INTEGRITY_BUILD_TARGET} --rtos_library_directory=libs/arm64/$ENV{INTEGRITY_BUILD_TARGET} -bigswitch -DINTEGRITY -llibivfs.a -llibposix.a -llibpaged_alloc.a -llibnet.a -llibsocket.a")
+
+set(CMAKE_C_FLAGS_DEBUG "-g -Omaxdebug")
+set(CMAKE_C_FLAGS_RELEASE "-Ospeed -Olink -Omax")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} --signed_fields --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor -I $ENV{QC_MULTIMEDIA_INC_DIR}")
+set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${TARGET_ROOT_PATH} -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display/ --commons")
+
+set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+set(BUILD_SHARED_LIBS OFF)
+set(CMAKE_EXE_LINKER_FLAGS "")
+
+set(QT_CFLAGS_OPTIMIZE_FULL "-Ospeed -olink -Omax")
+
+set(GLSLANG_OSDEP_PATH ../3rdparty/glslang/glslang/OSDependent/Unix)
+
+#set(QT_DEBUG_OPTIMIZATION_FLAGS "1")
+#set (QT_CMAKE_DEBUG_EXTEND_TARGET "1")
+
+set(EGL_INCLUDE_DIR $ENV{GL_INC_DIR})
+
+set(PKG_EGL_LIBRARY_DIRS ${TARGET_ROOT_PATH})
+set(EGL_LIBRARY ${TARGET_ROOT_PATH}/../libeglmegapack.a)
+
+#set(EGL_LIBRARY libESXEGL_Adreno.a libadreno_utils.a libESXGLESv2_Adreno.a libadreno_utils.a libGSLUser.a libOSUser.a libpanel.a libivfs.a libposix.a libpmem.a libtzbsp.a libpaged_alloc.a libglnext-llvm.a libopenwfd.a libplanedef.a liblogger.a libnet.a libsocket.a librfs_client.a libshm_client.a libmmosalrfs.a libmmosalfile.a libOSAbstraction.a)
+
+set(GLESv2_LIBRARY ${EGL_LIBRARY})
+set(GLESv2_INCLUDE_DIR $ENV{GL_INC_DIR})
+set(OPENGL_INCLUDE_DIR $ENV{GL_INC_DIR})
--- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
@@ -0,0 +1,25 @@
+set(CMAKE_SYSTEM_NAME QNX)
+
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
+
+set(_qnx_toolchain_arch gcc_ntoaarch64le)
+
+set(CMAKE_C_COMPILER qcc)
+set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
+set(CMAKE_CXX_COMPILER q++)
+set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
+
+set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
@@ -0,0 +1,25 @@
+set(CMAKE_SYSTEM_NAME QNX)
+
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
+
+set(_qnx_toolchain_arch gcc_ntoarmv7le)
+
+set(CMAKE_C_COMPILER qcc)
+set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
+set(CMAKE_CXX_COMPILER q++)
+set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
+
+set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake
@@ -0,0 +1,25 @@
+set(CMAKE_SYSTEM_NAME QNX)
+
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+endif()
+if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
+
+set(_qnx_toolchain_arch gcc_ntox86_64)
+
+set(CMAKE_C_COMPILER qcc)
+set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
+set(CMAKE_CXX_COMPILER q++)
+set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
+
+set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/linux/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -42,19 +42,22 @@ 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"
-urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
-SHA1_toolchainEs7="3c1edba781aa518e53e962cdb5fc5483aaa4991b"
-SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
+urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
+urlLibeglmegapack="http://ci-files01-hki.ci.local/input/integrity/integrity_libeglmegapack.zip"
+SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
+SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
 targetFolder="$HOME"
 appPrefix=""

+toolchain_file="${BASH_SOURCE%/*}/cmake_toolchain_files/integrity_toolchain.cmake"
+
 echo "Install Integrity toolchain es7"
 InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_toolchainEs7" "$targetFolder" "$appPrefix"

-echo "Install Integrity toochain addons"
-DownloadURL "$urlToolchainAddons" "$urlToolchainAddons" "$SHA1_toolchainAddons" "/tmp/integrity_toolchain_addons.zip"
-unzip "/tmp/integrity_toolchain_addons.zip" -d "/tmp"
+echo "Install Integrity toolchain addons"
+DownloadURL "$urlLibeglmegapack" "$urlLibeglmegapack" "$SHA1_Libeglmegapack" "/tmp/integrity_libeglmegapack.zip"
+unzip "/tmp/integrity_libeglmegapack.zip" -d "/tmp"
 mv /tmp/toolchain/* $targetFolder/toolchain
 mv $targetFolder/toolchain $targetFolder/integrity_toolchain
+cp $toolchain_file "$targetFolder/integrity_toolchain/toolchain.cmake"
 sudo rm -fr /tmp/toolchain
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/coin/provisioning/common/linux/qnx_710.sh
@@ -54,6 +54,10 @@ DownloadAndExtract () {
    rm -rf $file
 }

+aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
+armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
+x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
+
 targetFolder="/opt/"
 folderName="qnx710"
 targetPath="$targetFolder$folderName"
@@ -68,11 +72,9 @@ targetFile="qnx710.tar.xz"
 sha1="fa9eb0f4247504a546cb014784646847eb6c8114"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

-# Toolchain files
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz"
-targetFile="qnx-toolchains.tar.xz"
-sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath"
+sudo cp $aarch64le_toolchain $targetPath
+sudo cp $armv7le_toolchain $targetPath
+sudo cp $x8664_toolchain $targetPath

 sudo chown -R qt:users "$targetPath"

--- 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
@@ -63,6 +63,9 @@ EOC

 (ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

+# Make sure needed ca-certificates are available
+sudo apt-get install --reinstall ca-certificates
+
 # Git is not needed by builds themselves, but is nice to have
 # immediately as one starts debugging
 installPackages+=(git)
--- 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	19d1aabf20	Update submodules on '6.2.1 in qt/qt5' Change-Id: Id26057487c482d148f1f112c1201a454609b424b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-26 03:07:20 +00:00
Qt Submodule Update Bot	94ec940d5b	Update submodules on '6.2.1 in qt/qt5' Change-Id: I6cf16a1cca403f460af9f0d06ffb24e5d0b22b86 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-21 14:55:29 +00:00
Qt Submodule Update Bot	5fb3122e26	Update submodules on '6.2.1 in qt/qt5' Change-Id: I428fcdfb4c6ce689b7b99eb2a84d13ab7d4be105 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-20 13:58:53 +00:00
Qt Submodule Update Bot	d6ebbad65e	Update submodules on '6.2.1' in qt/qt5 Change-Id: Ica73368bef5c3819fbe84944d3f0b7ae88f1809a Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>	2021-10-19 12:45:27 +03:00
Jani Heikkinen	2238e32264	Adjust submodule branches Change-Id: Ie4c48ac8b3a353ddc2ec0b4434a40d66a2d9861d	2021-10-13 08:14:05 +03:00
Joerg Bornemann	31610bf8c0	CI: Turn dbus support off for QNX_710 QtDBus is built even if system dbus is not found, and QtGui depends on QtDBus. To link a consumer of QtGui, the -rpath-link option must be passed to the linker. That is not done at the moment, due to QTBUG-86533. Fixes: QTBUG-96791 Task-number: QTBUG-86533 Change-Id: I381747f15135fe65777985742dca0fd102583941 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `420adf322a`)	2021-10-11 09:21:27 +00:00
Qt Submodule Update Bot	ae8b953343	Update submodules on '6.2' in qt/qt5 Change-Id: I6368ed7114d701c5ca31fda39a8d6f1f14cfde2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-07 13:03:48 +03:00
Qt Submodule Update Bot	2e91316fa3	Update submodules on '6.2' in qt/qt5 Change-Id: If9157e50a35e57e9d59ee34b2eccea6ac73286e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-06 00:59:30 +03:00
Heikki Halmet	ed724f842b	Provisioning: Re-install ca-certificates for Ubuntu 20.04 This makes sure that needed ca-certificates are installed during provisioning Change-Id: I39289f237a54ca0805b1d9116ee899aecf02e72f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `3b09730b44`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-10-05 18:15:19 +00:00
Qt Submodule Update Bot	564fddd1aa	Update submodules on '6.2' in qt/qt5 Change-Id: Icdc8dd2095e2e0a5636f8c89181d39e0936e0c7f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-04 20:57:41 +03:00
Qt Submodule Update Bot	8df89f1f84	Update submodules on '6.2' in qt/qt5 Change-Id: Id05b4bef885c7115694077c9db0bf6ee9cd7d761 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-02 06:55:56 +03:00
Qt Submodule Update Bot	e5f7eb075f	Update submodules on '6.2' in qt/qt5 Change-Id: Ia0d34014d08a282844b5c46aaa75fb62d71ff0c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-01 20:49:39 +03:00
Qt Submodule Update Bot	cf4464c133	Update submodules on '6.2' in qt/qt5 Change-Id: Ib70902bbd55a4a4d1c28d5e147c3d088d931381d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-01 08:50:26 +03:00
Qt Submodule Update Bot	887d4032fa	Update submodules on '6.2' in qt/qt5 Change-Id: I62741b04194baab1baf0162995fc74c5cd777220 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-30 14:12:08 +03:00
Dan Ackers	7b9448f2b9	Rename new file for clarity Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `96269c2d01`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-09-29 13:05:02 +00:00
Qt Submodule Update Bot	403f9d56e7	Update submodules on '6.2' in qt/qt5 Change-Id: I49239b6f4b59f19513a91a52208a25c73806f9c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-29 09:57:13 +03:00
Dan Ackers	8504d78c96	Make QNX-toolchain files git-tracked Also, qnx now builds only using toolchain packages, ignoring host mahcine. Task-number: QTQAINFRA-4502 Change-Id: Ifd2f3cf1260b92cee8040e1d2213809bad1b3fc1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `80d0b2a91b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-09-28 22:32:01 +00:00
Dan Ackers	04f7a70291	Integrity: git track toolchain file Also make cmake find libraries only from toolchain Task-number: QTQAINFRA-4580 Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `cae9a1e8ef`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-09-28 22:32:01 +00:00
Qt Submodule Update Bot	5f06a16be9	Update submodules on '6.2' in qt/qt5 Change-Id: I1cc372fc1771c6720dab93b9fe3be646c6de8555 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-28 20:09:26 +03:00
Qt Submodule Update Bot	f5c6dde718	Update submodules on '6.2' in qt/qt5 Change-Id: I351a637e8d09c01b6bb7155d518603431a7b6fd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-28 08:48:40 +03:00
Alexandru Croitor	53779c4fa1	wasm: Don't include debug info in Qt for WebAssembly packages This substantially decreases the package sizes. It's also what we currently do for Qt 5.15.x WebAssembly builds. See also `f44dfe9c34` which did not enable debug information for iOS builds because there's no implementation for separating the debug info from static libraries yes. Task-number: QTBUG-96793 Change-Id: I743946c9e1367e88c7dd6dafec57648d9dbf2e9c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `551c838bad`)	2021-09-27 11:56:56 +02:00
Qt Submodule Update Bot	c2a8760db7	Update submodules on '6.2' in qt/qt5 Change-Id: I69b166a88acd1773d8e74ad192a8974044052e10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-25 10:47:18 +03:00
Qt Submodule Update Bot	77e75866a2	Update submodules on '6.2' in qt/qt5 Change-Id: Ibbf01a3d74121d12dc806adecdf045e3c8c0b6e4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-24 23:03:14 +03:00
Qt Submodule Update Bot	a193212edd	Update submodules on '6.2' in qt/qt5 Change-Id: I0ddd5d9e9ead853ff437799c3e1d41bfdd9955eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-21 04:26:39 +03:00
Qt Submodule Update Bot	21092f1a60	Update submodules on '6.2' in qt/qt5 Change-Id: Ia68b201a8f1ed988995574f4ff18dd946cac70f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-20 17:01:55 +03:00
Qt Submodule Update Bot	33b1a3a319	Update submodules on '6.2' in qt/qt5 Change-Id: I41240201c1c2c55df8ad429eb3d926a16bb730bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-20 07:16:32 +03:00
Qt Submodule Update Bot	8f77aad620	Update submodules on '6.2' in qt/qt5 Change-Id: I84d860988a29673b3e6acdb2c97a06d4f175d9f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-15 12:29:27 +03:00
Qt Submodule Update Bot	606219e8ae	Update submodules on '6.2' in qt/qt5 Change-Id: Ic29a3336f09138631bbdd3204fd62aa45677242d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-15 03:10:28 +03:00
Qt Submodule Update Bot	ce0a3d708c	Update submodules on '6.2' in qt/qt5 Change-Id: I0f9ae16e27e01b35036ed1ce079cb49cb7fa9c4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-14 14:55:17 +03:00
Qt Submodule Update Bot	bb898b6cc0	Update submodules on '6.2' in qt/qt5 Change-Id: I0331b379dd023e74dc59a6e40e9aae43cff75f85 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-09 20:49:02 +03:00
Qt Submodule Update Bot	21e86307ed	Update submodules on '6.2' in qt/qt5 Change-Id: I7e124fb9c53ed512f6f581170a256ca20dccef17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-09 04:42:19 +03:00
Heikki Halmet	e5679646b5	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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-09-08 05:28:19 +00: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