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

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

Browse Source 
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
This commit is contained in:
Frederik Gladhorn
2018-01-22 12:19:10 +01:00
parent dc1560dbef b6a1e9f07e
commit 052b4b5844
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/default.txt
View File

@@ -11,7 +11,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests

21
coin/provisioning/common/windows/disable-windows-updates.ps1
View File

@@ -33,5 +33,22 @@
# This script disables the automatic Windows updates
stop-service wuauserv
set-service wuauserv <EFBFBD>startup disabled
$service = get-service wuauserv
if (-not $service) {
Write-Host "Windows Update service not found."
exit 0
}
if ($service.Status -eq "Stopped") {
Write-Host "Windows Update service already stopped."
} else {
Write-Host "Stopping Windows Update service."
stop-service wuauserv
}
$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
if ($startup -ne "Disabled") {
set-service wuauserv -startup disabled
} else {
Write-Host "Windows Update service startup already disabled."
}

7
coin/provisioning/common/windows/install-notepad++.ps1
View File

@@ -57,11 +57,6 @@ Remove-Item -Recurse -Force "$nppPackage"
echo "Notepad++ = $version" >> ~\versions.txt
if( (is64bitWinHost) -eq 1 ) {
Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
}
else {
Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
}
Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
echo "Auto-updating disabled."

4
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
View File

@@ -52,8 +52,8 @@ ExceptionProxy=104
try
(
echo "Set timezone to UTC" || throw $ExceptionTimezone
sudo timedatectl set-timezone Etc/UTC
echo "Set timezone to UTC."
sudo timedatectl set-timezone Etc/UTC || throw $ExceptionTimezone
echo "Timeout for blanking the screen (0 = never)"
gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
echo "Prevents screen lock when screesaver goes active."

2
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
View File

@@ -38,7 +38,7 @@
$zip = "c:\users\qt\downloads\qnx700.7z"
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7"
Extract-7Zip $zip C:\
[Environment]::SetEnvironmentVariable("QNX_700", "C:\QNX700", "Machine")