Provisioning: Update openssl to version 1.0.2p

Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 3b4ca5d6c0) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Update submodules on '5.11.3' in qt5
2025-12-22 16:06:16 +08:00 · 2018-11-27 05:44:26 +00:00 · 2018-11-27 05:44:22 +00:00 · 2018-11-21 06:34:37 +00:00 · 2018-11-13 18:40:34 +00:00 · 2018-11-11 20:42:04 +00:00
58 changed files with 114 additions and 112 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -9,7 +9,11 @@

 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
-# One task per entry. Remember space after colon.
+# One task per entry. Add a space after the colon.
+# Use Fixes to automatically close an issue, and Task-number to
+# reference it without further action.
+# You do not need both for the same issue.
+#Fixes: 
 #Task-number: 
 #Coverity-Id: 
 #
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,77 +121,77 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -204,108 +204,108 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = preview
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.11.2
+	branch = 5.11.3
 	status = preview
--- a/4
+++ b/4
@@ -49,8 +49,8 @@ BraceWrapping:

 # When constructor initializers do not fit on one line, put them each on a new line.
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-# Indent initializers by 8 spaces
-ConstructorInitializerIndentWidth: 8
+# Indent initializers by 4 spaces
+ConstructorInitializerIndentWidth: 4

 # Indent width for line continuations.
 ContinuationIndentWidth: 8
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -16,9 +16,9 @@ qtci-linux-RHEL-7.4-x86_64                                          GCC
 qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.11-x86_64-3                                             Clang       Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8           IOS_ANY             multi       Clang       Release DisableTests Static
-qtci-macos-10.12-x86_64-8           TvOS_ANY            multi       Clang       Release DisableTests
-qtci-macos-10.12-x86_64-8           WatchOS_ANY         multi       Clang       Release DisableTests
+qtci-macos-10.12-x86_64-8           IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.12-x86_64-8           TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.12-x86_64-8           WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -13,9 +13,6 @@ qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packagin
 qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw73     Packaging Release DisableTests OpenGLES2
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="1.0.2o"
+version="1.0.2p"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
 installFolder="/home/qt/"
-sha="a47faaca57b47a0d9d5fb085545857cc92062691"
+sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
 # Until every VM doing Linux Android builds have provisioned the env variable
 # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
 # QTQAINFRA-1436
@@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

 tar -xzf "$targetFile" -C "$installFolder"
 # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-mv "${opensslHome}o" "${opensslHome}"
+mv "${opensslHome}p" "${opensslHome}"
 pushd "$opensslHome"

 echo "Running configure"
--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -40,7 +40,7 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
 SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
 targetFolder="/opt/paho_broker"
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -39,9 +39,9 @@
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

-$version = "1.0.2o"
+$version = "1.0.2p"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
+$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
 $destination = "C:\Utils\openssl-android-master"

 Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
--- a/coin/provisioning/common/windows/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
@@ -3,7 +3,7 @@
 $version = "1_1_2"
 $zip = Get-DownloadLocation "jom_$version.zip"

-Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
+Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.intra.qt.io/input/windows/jom_$version.zip $zip
 Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
 Extract-7Zip $zip C:\Utils\Jom

--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -38,7 +38,7 @@ $zip = Get-DownloadLocation "pahotest.zip"
 $commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
 $sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"

-$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
 $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"

 Download $externalUrl $internalUrl $zip
--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "1_0_2o"
+$version = "1_0_2p"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"

@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
    $installFolder = "C:\openssl"
    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "86c71a28eda53fa406b957dd37491d616344b464"
+    $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"

    Write-Host "Fetching from URL ..."
    Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {

 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe"
+$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"

 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86
--- a/coin/provisioning/common/windows/vulkansdk.ps1
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -36,7 +36,7 @@
 # This script will install Vulkan SDK

 $version = "1.0.51.0"
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"

 Copy-Item $url_cache $vulkanPackage
--- a/coin/provisioning/common/windows/win10sdk.ps1
+++ b/coin/provisioning/common/windows/win10sdk.ps1
@@ -35,7 +35,7 @@

 # This script will install Windows 10 SDK

-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winsdksetup.exe"
 $url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
 $package = "C:\Windows\Temp\winsdksetup.exe"
 $sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -42,3 +42,5 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 if [ "$http_proxy" != "" ]; then
    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi
+
+sudo yum update -y nss curl
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

-opensslVersion="1.0.2o"
+opensslVersion="1.0.2p"
 opensslFile="openssl-$opensslVersion.tar.gz"
 opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691"
+opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"

 # Below target location has been hard coded into Coin.
 # QTQAINFRA-1195
--- a/11
+++ b/11
@@ -299,7 +299,7 @@ use constant {

 sub git_clone_all_submodules
 {
-    my ($self, $my_repo_base, $co_branch, @subset) = @_;
+    my ($self, $my_repo_base, $co_branch, $alternates, @subset) = @_;

    my %subdirs = ();
    my %subbranches = ();
@@ -406,7 +406,7 @@ sub git_clone_all_submodules

    foreach my $module (@modules) {
        $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module},
-                                       $co_branch && $subbranches{$module});
+                                       $co_branch && $subbranches{$module}, $alternates);
    }

    if ($co_branch) {
@@ -434,7 +434,7 @@ sub git_clone_all_submodules
            if (-f $module.'/.gitmodules') {
                my $orig_cwd = getcwd();
                chdir($module) or confess "chdir $module: $OS_ERROR";
-                $self->git_clone_all_submodules($subbases{$module}, 0, "all");
+                $self->git_clone_all_submodules($subbases{$module}, 0, "$alternates/$module", "all");
                chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
            }
        }
@@ -491,9 +491,8 @@ sub git_stat_one_submodule

 sub git_clone_one_submodule
 {
-    my ($self, $submodule, $repo_basename, $branch) = @_;
+    my ($self, $submodule, $repo_basename, $branch, $alternates) = @_;

-    my $alternates            = $self->{ 'alternates'        };
    my $mirror_url            = $self->{ 'mirror-url'        };
    my $protocol              = $self->{ 'protocol'          };

@@ -643,7 +642,7 @@ sub run
    $url =~ s/qt5$//;
    $self->{'base-url'} = $url;

-    $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}});
+    $self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});

    $self->git_add_remotes('qt5');

--- 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
--- 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
Juha Karjalainen	1deea3debc	Provisioning: Update openssl to version 1.0.2p Task-number: QTQAINFRA-2266 Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `3b4ca5d6c0`) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-11-27 05:44:26 +00:00
Qt Submodule Update Bot	76b9b7dbd3	Update submodules on '5.11.3' in qt5 Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-27 05:44:22 +00:00
Qt Submodule Update Bot	5c4d85a9b9	Update submodules on '5.11.3' in qt5 Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-21 06:34:37 +00:00
Qt Submodule Update Bot	fbf22546be	Update submodules on '5.11.3' in qt5 Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-13 18:40:34 +00:00
Qt Submodule Update Bot	caf4c58941	Update submodules on '5.11.3' in qt5 Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-11 20:42:04 +00:00
Qt Submodule Update Bot	c17352fc12	Update submodules on '5.11.3' in qt5 Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-09 21:47:12 +00:00
Oswald Buddenhagen	3bb63c22c4	Adjust submodule branches Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750	2018-11-02 15:29:23 +01:00
Joni Jäntti	7e67d0e558	Provisioning: RHEL-6.6: Update curl The currently used version of curl does not support TLS 1.2 or newer. Since download.qt.io has minimum requirement of TLS 1.2 we need to update the these packages. Task-number: QTQAINFRA-2212 Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-11-02 07:59:24 +00:00
Tony Sarajärvi	b082d7d544	Replace .ci.local addresses with .intra.qt.io in provisioning scripts Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot	195799f36c	Update submodules on '5.11' in qt5 Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-11-01 07:16:52 +00:00
Oswald Buddenhagen	1af3c19fc8	commit template: add missing trailing space to Fixes footer Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot	7ea65aec65	Update submodules on '5.11' in qt5 Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-26 10:28:13 +00:00
Qt Submodule Update Bot	26cece9f93	Update submodules on '5.11' in qt5 Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot	96a07386fb	Update submodules on '5.11' in qt5 Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-23 18:13:07 +00:00
Qt Submodule Update Bot	ab7b56afe6	Update submodules on '5.11' in qt5 Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot	bb1f484318	Update submodules on '5.11' in qt5 Change-Id: Id7020bdeb4cafb5e6fe83fcf8833b882695205c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-19 10:47:06 +00:00
Qt Submodule Update Bot	2863cdc7aa	Update submodules on '5.11' in qt5 Change-Id: I4327f5eef196cdad0ea41c7e2b8e59ccaa637582 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-16 10:07:34 +00:00
Qt Submodule Update Bot	d30c0366db	Update submodules on '5.11' in qt5 Change-Id: I4a586ab957fc68b0afb2334048040e01f398a07b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-13 08:53:14 +00:00
Qt Submodule Update Bot	e05e24aa18	Update submodules on '5.11' in qt5 Change-Id: I0c458253ebe502ad13b40c6dda619ec9779e675e Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-10-09 13:15:18 +00:00
Qt Submodule Update Bot	f0f31335e9	Update submodules on '5.11' in qt5 Change-Id: If72a35b56e4f1a1c102f60d2db543dd07c525dcd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-10-03 04:31:14 +00:00
Qt Submodule Update Bot	0e4743cabf	Update submodules on '5.11' in qt5 Change-Id: Ie4b2b37794d3cfad7da7c7449d287369c5b6315b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-27 08:57:36 +00:00
Qt Submodule Update Bot	1ce244fec0	Update submodules on '5.11' in qt5 Change-Id: Iff73075fe2038d7d1f7fc0853723004b263e994a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-26 10:30:13 +00:00
Qt Submodule Update Bot	04b1fb9adc	Update submodules on '5.11' in qt5 Change-Id: I39b766717891eeeca7da66be4b61937f2dec80dd Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-18 08:30:08 +00:00
Liang Qi	a0d9b4605e	Merge remote-tracking branch 'origin/5.11.2' into 5.11 Change-Id: Ia69cee4eaced64a0c46123a59918b984ab24317f	2018-09-17 10:47:59 +02:00
Qt Submodule Update Bot	e4b9ccbbde	Update submodules on '5.11' in qt5 Change-Id: Ia6d0831b5376b92d8e2a261fe9f5626d3f2fddaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-16 13:32:19 +00:00
Qt Submodule Update Bot	01c2cf3d8c	Update submodules on '5.11' in qt5 Change-Id: I7a43072f75fc3ab3fb1814593af0bf6910ac85c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-15 13:02:31 +00:00
Qt Submodule Update Bot	31d989af00	Update submodules on '5.11' in qt5 Change-Id: If048c9cde7b6374c844cba513658564fe476abc1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-13 14:42:50 +00:00
Kai Koehne	6dfe5c31f2	init-repo: Resolve alternate url for git sub-submodules Do set correct --alternates argument for sub-submodules like qtwebengine/src/3rdparty. So far these repositories were always fully cloned from remote (or the mirror). Fixes: QTBUG-61901 Change-Id: I19f5930a03ab9050b6e62ac5a5c78780d0544e03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>	2018-09-13 08:53:29 +00:00
Liang Qi	e866953948	Merge remote-tracking branch 'origin/5.11.2' into 5.11 Conflicts: coin/platform_configs/qt5.txt Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35	2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot	e95824f59e	Update submodules on '5.11' in qt5 Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-10 07:38:43 +00:00
Qt Submodule Update Bot	bf0b84a051	Update submodules on '5.11' in qt5 Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-09-07 05:30:18 +00:00
Qt Submodule Update Bot	72505cc55b	Update submodules on '5.11' in qt5 Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot	b9b8066d97	Update submodules on '5.11' in qt5 Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-09-04 08:45:49 +00:00
Frederik Gladhorn	8b4d267af7	Add Fixes: tag to commit template Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>	2018-08-31 08:35:56 +00:00
Frederik Gladhorn	5872e22f31	_clang-format: indent initializers with four spaces, not eight Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>	2018-08-30 09:09:28 +00:00
Qt Submodule Update Bot	5a2a93ddf4	Update submodules on '5.11' in qt5 Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-08-29 21:30:44 +00:00
Liang Qi	2b2a639fb9	Unify the iOS/tvOS/watchOS builds in default.txt Then we can save more virtual machines. DebugAndRelease V.S. Release(build time): qtbase * iOS static: 14min, 57s : 11min, 35s * tvOS: 17min, 24s : 9min, 38s * watchOS: 16min, 36s : 9min, 46s The longest ones, some win10 builds, are about 40 min. And the longest ones for tests, are about 1 and half hours. qtdeclarative * iOS static: 19min, 10s : 12min, 19s * tvOS: 20min, 35s : 12min, 55s * watchOS: 15min, 17s : 9min, 59s qtwebengine * iOS static: 12min, 48s : 4min, 14s * tvOS: 6min, 6s : 4min, 10s * watchOS: 6min, 21s : 6min, 13s Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2018-08-28 19:02:05 +00:00
Qt Submodule Update Bot	7b029c8ca2	Update submodules on '5.11' in qt5 Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-08-28 19:02:01 +00:00