lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-24 13:47:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
This commit is contained in:
Simon Hausmann
2017-07-26 15:34:03 +02:00
parent 42a802efba f56f2c20c4
commit b229f6d1ea
10 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"

11
coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
View File

@@ -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