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

1 files changed, 0 insertions, 60 deletions

diff --git a/coin/provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1
deleted file mode 100644
index 74c21e20..00000000
--- a/coin/provisioning/common/windows/03-conan.ps1
+++ /dev/null
@@ -1,60 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$scriptsPath = "C:\Python27\Scripts"
-
-Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0"
-
-# Use Qt Project repository by default
-Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert"
-
-Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
-
-function Run-Conan-Install
-{
-    Param (
-        [string]$ConanfilesDir,
-        [string]$BuildinfoDir,
-        [string]$Arch,
-        [string]$Compiler,
-        [string]$CompilerVersion,
-        [string]$CompilerRuntime,
-        [string]$CompilerLibcxx
-    )
-
-    if ($CompilerRuntime) {
-        $extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
-    }
-
-    if ($CompilerLibcxx) {
-        $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
-    }
-
-    $manifestsDir = "$PSScriptRoot\conan_manifests"
-
-    Get-ChildItem -Path "$ConanfilesDir\*.txt" |
-    ForEach-Object {
-        $conanfile = $_.FullName
-        $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
-        New-Item $outpwd -Type directory -Force
-
-        for ($i = 1; $i -le 5; $i++) {
-            try {
-                Push-Location $outpwd
-                Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", `
-                    '-s', ('compiler="' + $Compiler + '"'), `
-                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
-                break;
-            } catch {
-                if ($i -eq 5) {
-                    throw "Could not install conan content"
-                }
-            } finally {
-                Pop-Location
-            }
-        }
-
-        Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
-    }
-}
-
-Write-Output "Conan = 0.24.0" >> ~\versions.txt