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

Merge remote-tracking branch 'origin/5.6' into 5.7

Browse Source 
Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
This commit is contained in:
Liang Qi
2016-06-14 20:25:20 +02:00
parent 4f64747383 9b6d296096
commit bbe0a01fde
14 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/helpers.ps1
View File

@@ -27,5 +27,5 @@ function Extract-Zip
$shell = new-object -com shell.application
$zipfile = $shell.Namespace($Source)
$destinationFolder = $shell.Namespace($Destination)
$destinationFolder.CopyHere($zipfile.Items())
$destinationFolder.CopyHere($zipfile.Items(), 16)
}

9
coin/provisioning/common/icu.ps1 Normal file
View File

@@ -0,0 +1,9 @@
# ICU is already pre-installed on Windows machines, it would be nice to have
# the installation script, but for now let's just export the right variables
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
# FIXME: do we really want to use the 4.8.2 ICU build?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")

2
coin/provisioning/common/jom.ps1
View File

@@ -5,3 +5,5 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
Extract-Zip $zip C:\Utils\Jom
[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")

2
coin/provisioning/qtci-osx-10.10/crashreporter.sh Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
defaults write com.apple.CrashReporter DialogType server

2
coin/provisioning/qtci-osx-10.11/crashreporter.sh Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
defaults write com.apple.CrashReporter DialogType server

2
coin/provisioning/qtci-osx-10.8/crashreporter.sh Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
defaults write com.apple.CrashReporter DialogType server

2
coin/provisioning/qtci-osx-10.9/crashreporter.sh Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/sh
defaults write com.apple.CrashReporter DialogType server

6
coin/provisioning/qtci-windows-10-x86/icu.ps1 Normal file
View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\icu.ps1"
Set-ExecutionPolicy Restricted -Force

6
coin/provisioning/qtci-windows-10-x86_64/icu.ps1 Normal file
View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\icu.ps1"
Set-ExecutionPolicy Restricted -Force

6
coin/provisioning/qtci-windows-7-x86/icu.ps1 Normal file
View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\icu.ps1"
Set-ExecutionPolicy Restricted -Force

6
coin/provisioning/qtci-windows-8-x86/icu.ps1 Normal file
View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\icu.ps1"
Set-ExecutionPolicy Restricted -Force

6
coin/provisioning/qtci-windows-8-x86_64/icu.ps1 Normal file
View File

@@ -0,0 +1,6 @@
Set-ExecutionPolicy RemoteSigned -Force
# install jom
. "$PSScriptRoot\..\common\icu.ps1"
Set-ExecutionPolicy Restricted -Force