mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 04:16:39 +08:00
Merge remote-tracking branch 'origin/5.6' into 5.9
42b502fis not needed for branches >= 5.8, configure.exe does not exist anymore.30660bfwas not applied to 5.9 branch, the scripts were not adapted to new template. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
This commit is contained in:
@@ -92,6 +92,7 @@ function Download
|
||||
[string] $CachedUrl = $(BadParam("the locally cached URL")),
|
||||
[string] $Destination = $(BadParam("a download target location"))
|
||||
)
|
||||
$ProgressPreference = 'SilentlyContinue'
|
||||
try {
|
||||
if ($CachedUrl.StartsWith("http")) {
|
||||
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
|
||||
@@ -109,5 +110,17 @@ function Add-Path
|
||||
[string]$Path
|
||||
)
|
||||
echo "Adding $Path to Path"
|
||||
[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
|
||||
|
||||
$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
|
||||
[Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
|
||||
}
|
||||
|
||||
function is64bitWinHost
|
||||
{
|
||||
if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
|
||||
return 1
|
||||
}
|
||||
else {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user