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

Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29

10 files changed, 80 insertions, 23 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index d2328871..7ee4df05 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,16 +1,14 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release
+qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release DisableTests
 qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
-qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-7-x86-2                                                Mingw53     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-7                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
 qtci-linux-openSUSE-42.1-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
@@ -20,6 +18,6 @@ qtci-osx-10.10-x86_64                                               Clang
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
 qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64      Boot2Qt_Jethro      armv7       GCC         Release
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64-1    Boot2Qt_Jethro      armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
 qtci-linux-RHEL-7.2-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index bf1ec3ff..8e030bbd 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,8 +1,10 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8-x86-2                                        MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8-x86_64-2                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt
index c7552671..c8ac9c47 100644
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,3 +1,3 @@
-Template                        Target OS           Target arch Compiler    Features
-------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64  Boot2Qt_Jethro      x86_64      GCC         DeveloperBuild
+Template                          Target OS           Target arch Compiler    Features
+--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-linux-Ubuntu-16.04-x86_64-1  Boot2Qt_Jethro      x86_64      GCC         DeveloperBuild
diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1
new file mode 100644
index 00000000..7ea0629d
--- /dev/null
+++ b/coin/provisioning/common/mesa_llvmpipe.ps1
@@ -0,0 +1,63 @@
+#############################################################################
+##
+## Copyright (C) 2017 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\helpers.ps1"
+
+$version = "11_2_2"
+$package = "C:\Windows\temp\opengl32sw.7z"
+$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
+$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
+$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
+
+function Extract-Mesa
+{
+    Param (
+        [string]$downloadUrl,
+        [string]$sha1,
+        [string]$targetFolder
+    )
+    Write-Host "Installing Mesa from $downloadUrl to $targetFolder"
+    $localArchivePath = "C:\Windows\temp\opengl32sw.7z"
+    Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $localArchivePath
+    Verify-Checksum $localArchivePath $sha1
+    Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$targetFolder"}
+    Remove-Item $localArchivePath
+}
+
+if ( Test-Path C:\Windows\SysWOW64 ) {
+    Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative"
+    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
+} else {
+    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
+}
+
diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
index fa2c753a..bd9afd5a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -34,22 +34,11 @@
 . "$PSScriptRoot\..\common\helpers.ps1"
 
 $version = "11_2_2"
-$package = "C:\Windows\temp\opengl32sw_$version.7z"
-$destinationFolder = "C:\Windows\SysWOW64"
 $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
 
-$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
-$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
 $openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
 $openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
 
-Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
-Verify-Checksum $package $mesaOpenglSha1
-Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"}
-
-echo "Remove downloaded $package ..."
-Remove-Item $package -recurse
-
 echo "Take ownership of existing opengl32.dll from SysWOW64"
 takeown /f $openglPackage
 icacls $openglPackage /grant Administrators:F
diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"