Merge remote-tracking branch 'origin/5.13' into dev

This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd

4 files changed, 91 insertions, 17 deletions

diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
deleted file mode 100644
index 807e5480..00000000
--- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw53-x86 `
-    -Arch x86 `
-    -Compiler "gcc" `
-    -CompilerVersion "5.3" `
-    -CompilerLibcxx "libstdc++11"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
index d57ad1cd..f90938c4 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
@@ -1 +1,63 @@
-. "$PSScriptRoot\..\common\windows\openssl.ps1"
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install OpenSSL prebuild version. Currently this pre-build version is only needed for Windows 7.
+# Version was build using Windows 7 x86 and MSVC2010
+
+# Used build commands below:
+# call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
+# perl Configure no-asm VC-WIN32 --prefix=C:\openssl\ --openssldir=C:\openssl\
+# nmake
+# nmake install
+
+
+$version = "1.1.1b"
+$zip = Get-DownloadLocation ("openssl-$version.7z")
+$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576"
+$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z"
+
+Download $url $url $zip
+Verify-Checksum $zip $sha1
+$installFolder = "C:\openssl"
+
+Extract-7Zip $zip "C:\"
+Remove-Item -Path $zip
+
+Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf"
+Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib"
+Prepend-Path "$installFolder\bin"
+
+Write-Output "OpenSSL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1
new file mode 100644
index 00000000..aa380a09
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir Mingw73-x86 `
+    -Arch x86 `
+    -Compiler "gcc" `
+    -CompilerVersion 7 `
+    -CompilerLibcxx "libstdc++" `
+    -CompilerException "dwarf2" `
+    -CompilerThreads "posix"
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
index 4a5bc05d..7a5a892a 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
@@ -1,8 +1,9 @@
 [requires]
-icu/57.1@annulen/stable
-libxml2/2.9.4@annulen/stable
-libxslt/1.1.29@annulen/stable
-zlib/1.2.8@annulen/stable
+icu/64.2@qtproject/stable
+libxml2/2.9.9@qtproject/stable
+libxslt/1.1.33@qtproject/stable
+libjpeg-turbo/2.0.2@qtproject/stable
+zlib/1.2.11@qtproject/stable
 
 [generators]
 cmake
@@ -10,13 +11,22 @@ txt
 
 [options]
 icu:shared=True
+icu:data_packaging=library
+
 libxml2:shared=True
+libxml2:iconv=False
+libxml2:icu=True
+libxml2:zlib=False
+
 libxslt:shared=True
+
+libjpeg-turbo:shared=False
+
 zlib:shared=False
 
 [imports]
-lib, icudt57.dll -> ./bin
-lib, icuin57.dll -> ./bin
-lib, icuuc57.dll -> ./bin
+lib, icudt64.dll -> ./bin
+lib, icuin64.dll -> ./bin
+lib, icuuc64.dll -> ./bin
 bin, libxml2-2.dll -> ./bin
 bin, libxslt-1.dll -> ./bin