Update submodules on '6.2' in qt/qt5

Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update Yocto toolchains
2025-12-25 09:26:15 +08:00 · 2021-06-22 08:24:28 +03:00 · 2021-06-18 12:43:41 +03:00 · 2021-06-18 12:42:44 +03:00 · 2021-06-16 22:22:31 +00:00 · 2021-06-16 14:43:33 +00:00
46 changed files with 159 additions and 116 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
-	status = ignore
+	branch = 6.2
+	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,14 +76,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -107,218 +107,213 @@
 	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
+	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtdeclarative
 	recommends = qtimageformats qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = dev
+	branch = 6.2
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
+	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = 6.2
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
+	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.2
 	status = addon
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -35,8 +35,16 @@ instructions:
          maxTimeBetweenOutput: 1200
          userMessageOnFailure: >
            Failed to generate docs.
-        - type: MakeDirectory
-          directory: "{{.BuildDir}}/qtbase/doc/global"
+        - 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
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -91,10 +91,10 @@ Configurations:
    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Insignificant', 'Packaging']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
    Platform dependency: 'Windows10-MSVC2019-x64-host'
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON',
+        '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',
        'TEST_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']
 -
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -1,5 +1,9 @@
 Version: 2
 Configurations:
+
+    # These developer-build tests are only run for qtbase and qtdeclarative
+    # See macos.yaml for arm64 developer-build tests, run for all modules.
+
    -
        Id: 'macos-10.14-x86_64-developer-build-tests'
        Template: 'qtci-macos-10.14-x86_64'
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -19,28 +19,28 @@ Configurations:
        Id: 'macos-10.14-x86_64-tests'
        Template: 'qtci-macos-10.14-x86_64'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-10.15-x86_64-tests'
        Template: 'qtci-macos-10.15-x86_64-102'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-x86_64-tests'
        Template: 'qtci-macos-11.0-x86_64-102'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-arm64-tests'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'

-    # Build developer builds for all modules, but only run tests for qtbase and declarative.
+    # Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative.
    # See macos-developer-build-tests.yaml for the tests
    -
        Id: 'macos-latest-xcode-x86_64-developer-build'
@@ -53,10 +53,17 @@ Configurations:
            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
            ]

-    # ARM64 target built on apple silicon
+    # Build arm64 developer-builds for all modules, and run their tests. This ensures that we have full
+    # arm64 build and test coverage, regardless of possible issues with the universal build.
    -
        Id: 'macos-latest-xcode-arm64-developer-build'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
-        Features: ['InsignificantTests']
+        Features: ['DoNotRunTests']
        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
+    -
+        Id: 'macos-11-arm64-developer-build-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
+        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -1,3 +1,30 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
+    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -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',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+    ]
+-
+    Id: 'RHEL-8.2-host'
+    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_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']
+-
+    Id: 'macOS-11.0'
+    Template: 'qtci-macos-11.0-x86_64-102'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=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',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    ]
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -7,7 +7,7 @@ Include: [
 ]
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh
@@ -42,13 +42,16 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

+primaryBaseUrlPath="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth"
+altBaseUrlPath="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth"
+
 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."

 versionARM="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-7031f145.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
-SHA1="167071eb1a02fdffe1d12576dcad6497fc996776"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="4d52038872f795fff3745c7cb5e1e89736122958"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/b2qt/$versionARM"
 sysrootARMv7="armv7vet2hf-neon-poky-linux-gnueabi"
@@ -65,10 +68,10 @@ rm -rf "$yoctoInstaller"
 echo "Installing Yocto toolchain for 64-bit b2qt ARM64..."

 versionARM64="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-7031f145.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
-SHA1="518afdecc4e2883d4ba1f4c43a628ce06df4e39a"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="7644f8ac883cd017a6abd4dafe7abfe21e922466"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/b2qt/$versionARM64"
 sysrootARM64="cortexa57-poky-linux"
@@ -85,10 +88,10 @@ rm -rf "$yoctoInstaller"
 echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..."

 versionMIPS64="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-7031f145.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
-SHA1="ba076bdc44d0fdce5d628f0d930943aa108d616d"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="7f3b84f68957c929deb031a53d55a5620b6cee5b"
 yoctoInstaller="/tmp/yocto-toolchain-mips64.sh"
 yoctoLocationMIPS64="/opt/b2qt/$versionMIPS64"
 sysrootMIPS64="mips64r2-poky-linux"
--- 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
--- 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	eea5f47027	Update submodules on '6.2' in qt/qt5 Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-06-22 08:24:28 +03:00
Heikki Halmet	34d0ca0f39	Update Yocto toolchains Pick-to: dev Task-number: QTQAINFRA-4459 Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>	2021-06-18 12:43:41 +03:00
Heikki Halmet	e216d829ff	Switch back to RedHat 8.2 for Android target Timeout increased so this should be ok to move back to Redhat 8.2 Pick-to: dev Task-number: QTQAINFRA-4415 Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>	2021-06-18 12:42:44 +03:00
Toni Saario	91030b897c	Archive global and config from qtbase in doc build Copy the global and config folder from under qtbase to directory from which the documentation.tar.gz is created. This is similar to how these are added in qmake builds. Task-number: QTBUG-94443 Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `7ed6d04410`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-06-16 22:22:31 +00:00
Alexandru Croitor	6276e48226	WoA: Build both release and debug configs for Windows on ARM The config is marked as Packaging, but it didn't specify the list of CMake configurations to build and defaulted only to Debug. Task-number: QTQAINFRA-4492 Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit `52eebe8a89`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-06-16 14:43:33 +00:00
Samuli Piippo	e40315c22d	Add static platform targets for qdb Static host platforms with packaging enabled. Change-Id: I137bde6ccefb960282c5a830eb3862f03ee2f5f5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Toni Saario <toni.saario@qt.io>	2021-06-16 12:17:01 +03:00
Assam Boudjelthia	a0f6a60fb7	Remove qtandroidextras submodule Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Pick-to: dev Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382 Reviewed-by: Simo Fält <simo.falt@qt.io>	2021-06-15 13:20:22 +00:00
Tor Arne Vestbø	b90fef29dc	coin: Make macOS on ARM developer-build tests significant Pick-to: dev Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-06-15 08:01:11 +03:00
Heikki Halmet	0a5e63dce9	Remove Insignificant flag from Windows ARM target Pick-to: dev Task-number: QTQAINFRA-4452 Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-06-14 13:49:54 +03:00
Jani Heikkinen	a1ee8408ff	Fix qtmultimedia status It has to be addon Pick-to: dev Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2021-06-14 08:52:20 +00:00
Jani Heikkinen	4d67b1e1fd	Restore qtmultimedia as a addon in qt5.git According to plan Qt Multimedia will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93129 Pick-to: dev Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391 Reviewed-by: Lars Knoll <lars.knoll@qt.io>	2021-06-12 00:39:12 +03:00
Jani Heikkinen	00be2755b8	Update submodules on '6.2' manually Submodule update bot didn't do this because of some reason so try this manually instead Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2021-06-11 07:31:03 +03:00
Simo Fält	80d999890d	Add 'Packaging' feature for Mac TestOnly CI configs This will allow exporting the testlogs for release. Task-number: QTBUG-94111 Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `9673311626`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-06-09 14:52:55 +00:00
Inho Lee	90e313538c	Quick3D : Add optional dependency to QtQuickTimeline Quick3D's runtime asset animation needs QuickTimeline module. This is an optional module just for the animation feature. Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit `6069cf9a84`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-06-09 13:01:37 +00:00
Jani Heikkinen	cad3bd7c94	Adjust submodule branches	2021-06-09 07:23:53 +03:00