Merge remote-tracking branch 'origin/5.12' into 5.12.0

Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f

8 files changed, 15 insertions, 15 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 8c90b80c..8878836c 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -2,7 +2,7 @@ Template                            Target OS           Target arch Compiler
 ----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-3                                                Mingw73                     DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-10                               x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
index 37065eff..5a189f25 100644
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1,7 +1,7 @@
 Template                    Target OS           Target arch Compiler    Target Compiler Features
 --------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 37065eff..5a189f25 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,7 @@
 Template                    Target OS           Target arch Compiler    Target Compiler Features
 --------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index 353722f2..09d0b6d5 100755
--- 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"
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1
index bac88de6..5390dfae 100644
--- 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
diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1
index 50bee891..4cc6a3b3 100644
--- 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
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index 8532f99a..f836cf1d 100755
--- 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
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
index 606a9c12..9e025a5e 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.13-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