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

Fix styles in setting proxy

Browse Source 
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Tony Sarajärvi
2018-02-26 10:16:57 +02:00
committed by Liang Qi
parent c7562fa8ef
commit b1c3eeb213
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/shared/http_proxy.txt
View File

@@ -1,2 +1,2 @@
proxy="http://proxy.intra.qt.io:3128"
proxy=http://proxy.intra.qt.io:3128

2
coin/provisioning/common/windows/set-proxy.ps1
View File

@@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
$n = $n.Split('=')
New-Variable -Name $n[0] -Value $n[1]
if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
if ([string]::IsNullOrEmpty($proxy)) {
Write-Host "No proxy is defined."
} else {
Write-Host "Checking proxy @ $proxy"

2
coin/provisioning/common/windows/unset-proxy.ps1
View File

@@ -32,6 +32,8 @@
#############################################################################
Write-Host "Disabling proxy"
# A bit-mask is needed to disable "Automatically detect settings" from LAN
# settings that disturb and re-enable proxy even after disabling it.
$dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings
$dcs[8] = $_ -band 0xF7
Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs