Merge remote-tracking branch 'origin/6.1' into pyside6.1

Change-Id: I7c69ec340c2c36d5c4eb30c87586fb45449968bf
Add missing modules for Qt For Python
2025-12-23 00:16:20 +08:00 · 2021-03-12 20:02:29 +02:00 · 2021-03-12 16:12:57 +02:00 · 2021-03-12 11:26:09 +02:00 · 2021-03-12 11:08:14 +02:00 · 2021-03-12 06:11:26 +02:00
27 changed files with 43 additions and 193 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,8 +21,8 @@
 	recommends = qttools
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -32,7 +32,7 @@
 	status = ignore
 [submodule "qttools"]
 	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
+	recommends = qtdeclarative
 	path = qttools
 	url = ../qttools.git
 	branch = 6.1
@@ -125,15 +125,15 @@
 	recommends = qtdeclarative qtshadertools qttools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	recommends = qttools
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
@@ -239,21 +239,21 @@
 	recommends = qtdeclarative qtmultimedia qttools
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia qttools
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols qttools
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -267,8 +267,8 @@
 	recommends = qttools
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -281,7 +281,7 @@
 	recommends = qttools
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtremoteobjects"]
 	depends = qtbase
@@ -302,7 +302,7 @@
 	recommends = qttools
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
@@ -332,17 +332,17 @@
 	depends = qtbase qttools
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.1
 	status = additionalLibrary
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -1,79 +1,8 @@
 Version: 2
 Include: [
-    cmake_platforms_qemu.yaml,
-    cmake_platforms_target_android_host_linux.yaml,
-    cmake_platforms_target_android_host_macos.yaml,
-    cmake_platforms_target_android_host_windows.yaml,
    macos.yaml
    ]
 Configurations:
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF -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']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=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']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -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']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -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: 'Ubuntu-20.04-host'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -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: 'Ubuntu-18.04-host'
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -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: 'Ubuntu-18.04-test-20.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'Sccache']
-    Environment variables: ['LD_LIBRARY_PATH=/opt/icu/lib64', 'QT_PRESERVE_TESTLIB_PATH=1']
-    Platform dependency: 'Ubuntu-18.04-host'
-
-    Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -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']
-
-    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    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']
 -
    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
@@ -84,14 +13,6 @@ Configurations:
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease"]
-    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
    Id: 'CentOS-8.3-host'
    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
@@ -100,40 +21,3 @@ Configurations:
    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
    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']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
-    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=']
-
-    Id: 'Windows10-Mingw8-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
-
-    Id: 'Windows10-LLVM-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -11,36 +11,3 @@ Configurations:
            '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'
            ]
-
-    # Then run tests on all supported deployment targets
-    -
-        Id: 'macos-10.14-x86_64-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-10.15-x86_64-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-
-    # Build 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'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests']
-        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -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/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,7 +57,7 @@ function InstallGCC() {
    suffixVersion=$(echo "$version" | cut -d "." -f1,2)
    sourceFile="gcc-$version.tar.xz"
    cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
-    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
+    officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"

    targetFile="$tmpFolder/$sourceFile"
    buildFolder="$HOME/gcc_build"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
@@ -5,4 +5,4 @@ set -ex
 # shellcheck source=../common/linux/gcc.sh
 source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"

-InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0
+InstallGCC 8.3.0 50 ccccfe4fe9206d111a173c19a21f8700d1133ae8 c27f4499dd263fe4fb01bcc5565917f3698583b2
--- a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\squishInstall.ps1"
--- a/2
+++ b/2
@@ -646,7 +646,7 @@ sub run
    die("Have no origin remote.\n") if (!$url);
    $url =~ s,\.git$,,;
    $url =~ s/((?:tqtc-)?qt5)$//;
-    my $qtrepo = $1 or 'qt5';
+    my $qtrepo = $1 || 'qt5';
    $self->{'base-url'} = $url;

    $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});
--- 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
Simo Fält	41e351d0cc	Merge remote-tracking branch 'origin/6.1' into pyside6.1 Change-Id: I7c69ec340c2c36d5c4eb30c87586fb45449968bf	2021-03-12 20:02:29 +02:00
Simo Fält	b160fee9bf	Add missing modules for Qt For Python Change-Id: I19b5dfaff41899b4d374a3849c03541298b89bb4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>	2021-03-12 16:12:57 +02:00
Simo Fält	07a9fbe5f1	Drop configs which are not needed by Qt5#Pyside This will free CI resources. Change-Id: Ib4af5ba7ece2a88b8a75b481a04a56ed4410c199 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>	2021-03-12 11:26:09 +02:00
Qt Submodule Update Bot	6fe5602897	Update submodules on '6.1' in qt/qt5 Change-Id: I06c3b417352b0deb875f0b04ba24d690d5cb7831 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-12 11:08:14 +02:00
Qt Submodule Update Bot	5cd58bd851	Update submodules on '6.1' in qt/qt5 Change-Id: I6b078f345acbf971be0947341b4085f86f67d4f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-12 06:11:26 +02:00
Qt Submodule Update Bot	130388acbd	Update submodules on '6.1' in qt/qt5 Change-Id: I99843339046d0bc00da17ce459896b8b1c234f85 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-11 09:41:52 +02:00
Qt Submodule Update Bot	4e2b9e0552	Update submodules on '6.1' in qt/qt5 Change-Id: I4d0d734391d36ab806e6a955ebe1cc2668ea1285 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-09 10:32:35 +02:00
Qt Submodule Update Bot	fb46ac4698	Update submodules on '6.1' in qt/qt5 Change-Id: Iefdb21860cbf8053c9fff29333865d7bece0c673 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-09 05:45:17 +02:00
Qt Submodule Update Bot	a0fa9081c2	Update submodules on '6.1' in qt/qt5 Change-Id: I78ea65c2c25e20c29a9b636dd6649ef98d8189d2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-06 07:02:51 +02:00
Qt Submodule Update Bot	91d6371aa7	Update submodules on '6.1' in qt/qt5 Change-Id: I8647d06c7156328d1fdadd542e95158b62d00bfd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-06 03:15:24 +02:00
Qt Submodule Update Bot	5dccb615d0	Update submodules on '6.1' in qt/qt5 Change-Id: Iae0b767cad3dc48eb369a810f3b4f60125646b3c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-05 23:05:31 +02:00
Qt Submodule Update Bot	ed885dcd96	Update submodules on '6.1' in qt/qt5 Change-Id: I3dbcbdbe64160ff1fc0dba5d8da2d3f9766d2e7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-05 16:05:40 +02:00
Qt Submodule Update Bot	dfd068a159	Update submodules on '6.1' in qt/qt5 Change-Id: I2578a59e7703b50da1726f68841f34a644f88983 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-04 10:03:58 +02:00
Qt Submodule Update Bot	598a978aec	Update submodules on '6.1' in qt/qt5 Change-Id: I517d4c07abce5ad46e086e4bb2bc11f8cf83ca31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-04 05:45:26 +02:00
Heikki Halmet	a41f41590b	Change GCC version to 8.3.0 for Ubuntu 18.04 We need to use gcc 8 instead of 9 so that the Qt installer will work with CentOS 8.3 which have gcc 8 in the system. If we use newer gcc version with the binaries there will be issues with libstdc++. Using gcc-toolset-9 in CentOS won't help either because it will link libstdc++ against the one in system. Task-number: QTBUG-91352 Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit `8843f51866`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-03 17:03:35 +00:00
Qt Submodule Update Bot	a62d1f6060	Update submodules on '6.1' in qt/qt5 Change-Id: I3c61d3853d29022cc8eddb7d6c59c9b02573c278 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-03 09:28:25 +02:00
Jani Heikkinen	58a2d3ab27	Fix branch for additional libraries We are in '6.1' so '6.1' needs to be used instead of 'dev' Change-Id: I89db2a5d33658ddb26b51abec41c5e9735850dce Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>	2021-02-26 10:14:20 +02:00
Topi Reinio	fada0bd6de	init-repository: Fix incorrect use of 'or' operator This fixes the warning 'Useless use of a constant ("qt5") in void context at ./init-repository line 649.' Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit `8ebf0095c3`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-02-25 16:19:28 +00:00
Heikki Halmet	790b582893	Provisioning: Remove squish script call under Windows 10 x86 RTA don't use squish with Windows 10 x86 in Qt6 Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `26bffd2fab`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-02-25 14:33:48 +00:00
Heikki Halmet	48d184635c	Change configuration arguments for Ubuntu 18.04 to match CentOS target We shouldn't change configuration parameters when whiching to use Ubuntu 18.04 instead of CentOS 8.3 Change-Id: Icfce35acec8baa4488089e555c311a063455c24b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `0a6511c1e7`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-02-25 07:39:38 +00:00
Qt Submodule Update Bot	025759926d	Update submodules on '6.1' in qt/qt5 Change-Id: I9ee42d73e1cd7db8f5418110b6386381e72fa5a4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-02-24 02:33:45 +02:00
Qt Submodule Update Bot	0c3bc777ad	Update submodules on '6.1' in qt/qt5 Change-Id: I3b7d6c8c5dc138d9afe2cc9260100b21b27d8ec3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-02-23 22:40:10 +02:00
Qt Submodule Update Bot	bf77b43a6f	Update submodules on '6.1' in qt/qt5 Change-Id: I60b1a1588833e98a13c3eb57bc65964dd8b5a513 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-02-23 16:36:44 +02:00
Simo Fält	fbedfdbbd5	CI: Drop configs not needed for pyside This will speeds up the integration rounds in case CI's storage is cleaned up. Change-Id: I0db3b604c58b367e7b2f91f8df05dc127ee8c3d5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit `1180ff14bb`)	2021-02-02 15:53:34 +02:00
Simo Fält	1f90c83c15	Initial version of Qt For Python 6.1 branch Change-Id: I955da23aa5bdee2ae137d11f065ff5bf2bb327e1 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>	2021-02-02 15:53:31 +02:00
				`@@ -1 +0,0 @@`
				`. "$PSScriptRoot\..\common\windows\squishInstall.ps1"`