Update submodules on '6.2.0' in qt/qt5

Change-Id: Id12e0ce164e0dcd82b5bcc504f8babbbb6643214 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-27 18:36:04 +08:00 · 2021-10-05 04:48:43 +03:00 · 2021-10-04 17:12:41 +03:00 · 2021-10-01 13:31:16 +03:00 · 2021-09-29 06:08:55 +03:00 · 2021-09-25 17:35:05 +03:00
60 changed files with 144 additions and 114 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,189 +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 "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 6.2
-	status = ignore
 [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/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -0,0 +1,12 @@
+Version: 2
+Configurations:
+-
+    Id: "ios-tests-target"
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- 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/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -15,7 +15,7 @@ Configurations:
    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -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 -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -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',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
--- a/coin/platform_configs/qtapplicationmanager.yaml
+++ b/coin/platform_configs/qtapplicationmanager.yaml
@@ -0,0 +1,3 @@
+Version: 2
+Include: [cmake_platforms.yaml]
+Configurations: []
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -3,7 +3,8 @@ Include: [
    cmake_platforms.yaml,
    cmake_platforms_static_tests.yaml,
    macos-developer-build-tests.yaml,
-    integrity.yaml
+    integrity.yaml,
+    ios-tests.yaml
 ]
 Configurations:
 -
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,6 +1,8 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
+    macos-developer-build-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/qtsdk.yaml
+++ b/coin/platform_configs/qtsdk.yaml
@@ -0,0 +1,6 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    qt-creator.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/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -55,8 +55,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
-sdkApiLevel="android-29"
+sdkBuildToolsVersion="30.0.3"
+sdkApiLevel="android-30"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
--- 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/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-29"
-$sdkBuildToolsVersion = "29.0.3"
+$sdkApiLevel = "android-30"
+$sdkBuildToolsVersion = "30.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
--- a/coin/provisioning/common/windows/ninja.ps1
+++ b/coin/provisioning/common/windows/ninja.ps1
@@ -2,8 +2,8 @@

 $zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"

-Download https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-x86.zip $zip
-Verify-Checksum $zip "ccacdf88912e061e0b527f2e3c69ee10544d6f8a"
+Download http://master.qt.io/development_releases/prebuilt/ninja/v1.10.2/ninja-win-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-really-x86.zip $zip
+Verify-Checksum $zip "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca"

 Extract-7Zip $zip C:\Utils\Ninja
 Remove "$zip"
--- 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
@@ -90,8 +90,7 @@ installPackages+=(libgbm-dev)
 installPackages+=(libxkbfile-dev)
 installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
-installPackages+=(nodejs)
-# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
+installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated

 # Common event loop handling
 installPackages+=(libglib2.0-dev)
@@ -231,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh

 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
--- 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
@@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel
 # qtwebengine
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \
+         mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
         libxshmfence-devel libXdamage-devel

 # qtwebkit
--- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
--- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh
@@ -37,10 +37,10 @@ set -ex

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

 InstallCommandLineTools $url $url $sha1 $packageName $version

--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- 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/1
+++ b/1
--- 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	61b6f0373c	Update submodules on '6.2.0' in qt/qt5 Change-Id: Id12e0ce164e0dcd82b5bcc504f8babbbb6643214 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-05 04:48:43 +03:00
Qt Submodule Update Bot	1d8225dd76	Update submodules on '6.2.0' in qt/qt5 Change-Id: Id35ed701f36d068ca6bd4a762cc85e7fa05ea2f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-04 17:12:41 +03:00
Qt Submodule Update Bot	4b20bc390f	Update submodules on '6.2.0' in qt/qt5 Change-Id: I6aa8d37b5f2dbd27f9d8df826deff2a69297d237 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-10-01 13:31:16 +03:00
Qt Submodule Update Bot	febbcf0338	Update submodules on '6.2.0' in qt/qt5 Change-Id: I375a8492c538775c2e88ce4e7e85d245b93b2b3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-29 06:08:55 +03:00
Qt Submodule Update Bot	b8e587b74c	Update submodules on '6.2.0' in qt/qt5 Change-Id: I7a7252751d9cc351a5d78ed94af5154e861a5fd8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-25 17:35:05 +03:00
Qt Submodule Update Bot	fac86c3865	Update submodules on '6.2.0' in qt/qt5 Change-Id: Ie8e2d877d5ca65cc31aaba113f20701e0e13aabb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-25 06:06:18 +03:00
Qt Submodule Update Bot	a23c44f7a3	Update submodules on '6.2.0' in qt/qt5 Change-Id: Ib03cbd4d8823223b166114ea2e487ddbd73ee9f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-23 06:23:28 +03:00
Qt Submodule Update Bot	ab311180ba	Update submodules on '6.2.0' in qt/qt5 Change-Id: I24e678b4a4eb628c3101502ce4d3a32a17e78625 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-21 22:00:41 +03:00
Qt Submodule Update Bot	893a7d6d98	Update submodules on '6.2.0' in qt/qt5 Change-Id: Idd65c0ed9da1e8a162c5b6a9516b2dfcca9a0128 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-21 06:50:15 +03:00
Qt Submodule Update Bot	0d2488bd32	Update submodules on '6.2.0' in qt/qt5 Change-Id: Id72a07fc3804bbb915367abff486b1f9c7233949 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-19 20:40:05 +03:00
Qt Submodule Update Bot	efb86886e1	Update submodules on '6.2.0' in qt/qt5 Change-Id: Ic3c9c12f9262c0c5a0bf7d09149146d4a2e6d6b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-19 09:20:03 +03:00
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
Qt Submodule Update Bot	3a4502ae3d	Update submodules on '6.2' in qt/qt5 Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-09-02 12:40:52 +03:00
Robert Griebl	33988e12ac	Add a platform config file for Qt Application Manager Change-Id: I59013a841e96eb679798e906af4c1af09884dc45 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit `2b22f80725`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-09-02 09:19:01 +02:00
Alexandru Croitor	51155b7bf8	Build minimal subset of tests in qtdeclarative desktop static builds Task-number: QTBUG-87580 Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `f0c7664195`) Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>	2021-08-27 14:42:00 +02:00
Alexandru Croitor	26e43959e1	iOS: Build a subset of tests when targeting iOS Currently will only build tests/auto/cmake projects in qtbase. More work is needed for the other repos. Task-number: QTBUG-95839 Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `4fea3be3af`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-27 08:09:25 +00:00
Assam Boudjelthia	8ab13223a5	Coin: bump Android build tools and platform sdk level from 29 to 30 Google requires target SDK level 30 for apps that can be accepted to the Play Store. This change goes together with bumping the default target sdk in qtbase (from 29 to 30 as well). Ideally, build tools should be kept up to date as well anyway. Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit `6ac98447b5`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-26 18:17:13 +00:00
Heikki Halmet	86a34fb5d7	Upgrade Xcode and Command line tools to the latest version for Big Sur Latest version is 12.5.1 Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit `f824365cb5`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-24 07:14:39 +00:00
Samuli Piippo	5f7bb79fd9	qdp: remove system dependencies Use more of the same arguments as RHEL-8.2-host to limit the unnecessary dependencies to the system libraries. Task-number: QTBUG-95882 Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>	2021-08-23 13:51:44 +03:00
Qt Submodule Update Bot	69197946f0	Update submodules on '6.2' in qt/qt5 Change-Id: I729fb6acd74ad1d366a12c6919868654d8df7218 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-20 06:26:23 +03:00
Eike Ziller	3c2fca6bb1	COIN: Re-add qtsdk.yaml That is used by our Jenkins setup for packaging. To keep things simple, just include the cmake_platforms and Qt Creator's config. Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059 Reviewed-by: Antti Kokko <antti.kokko@qt.io> (cherry picked from commit `bbd31689ec`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-19 12:29:12 +00:00
Qt Submodule Update Bot	bed102a587	Update submodules on '6.2' in qt/qt5 Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-19 09:33:14 +03:00
Allan Sandfeld Jensen	1f452fd479	Update node.js to 12 For Ubuntu it means using an alternative packages, for openSUSE not using an alternative package. Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `c4b8c908b6`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-18 19:19:46 +00:00
Eike Ziller	aaf0fad6b5	Provisioning: Install 32bit version of Ninja on Windows So it also runs on 32bit Windows. Ninja upstream switched their binary builds to 64bit with Ninja 1.7, so we need to provide our own. Amends `e8b0be7711` Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `f945fdc735`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-08-17 15:59:58 +00:00
Qt Submodule Update Bot	04ad2b6523	Update submodules on '6.2' in qt/qt5 Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-17 17:34:49 +03:00
Qt Submodule Update Bot	2ef340e02d	Update submodules on '6.2' in qt/qt5 Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-08-17 07:59:27 +03:00
Joerg Bornemann	384bff22f7	Remove qtgraphicaleffects from .gitmodules This repository has been merged into qt5compat. Change the 'recommends' field of qtquickcontrols2 from qtgraphicaleffects to qt5compat. Fixes: QTBUG-95228 Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit `cec25d2ac6`) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2021-08-16 12:47:23 +02:00