Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
Qt5
Commits
45528e68
Commit
45528e68
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
parents
21e73443
786be66e
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
ifw-5.12.10
ifw-5.12.11
pyside6.0
pyside6.1
wip/cmake
wip/emulator/master
wip/flashing-wizard/master
wip/navigation
wip/ogl-runtime/2.4
wip/ogl-runtime/2.5
wip/ogl-runtime/2.6
wip/ogl-runtime/2.7
wip/ogl-runtime/master
wip/pyside-setup/5.11.0
wip/pyside-setup/5.14
wip/qdb/master
wip/qt3d-runtime/2.0
wip/qt3d-runtime/2.0.1
wip/qt3d-runtime/2.1
wip/qt3d-runtime/2.2
wip/qt3d-runtime/2.3
wip/qt3d-runtime/2.4
wip/qt3d-runtime/master
wip/qt3dstudio/2.0
wip/qt3dstudio/2.0.1
wip/qt3dstudio/2.1
wip/qt3dstudio/2.2
wip/qt3dstudio/2.3
wip/qt3dstudio/2.4
wip/qt3dstudio/2.5
wip/qt3dstudio/2.6
wip/qt3dstudio/2.7
wip/qt3dstudio/master
wip/qt3dstudio/runtime2
wip/qt6
wip/qtsaferenderer/1.1
wip/qtsaferenderer/1.2
wip/qtsaferenderer/master
wip/qtwebkit/5.212
wip/tqtc-qt-config-gui/master
wip/webassembly
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
coin/platform_configs/default.txt
+1
-1
coin/platform_configs/default.txt
coin/provisioning/common/windows/disable-windows-updates.ps1
+19
-2
coin/provisioning/common/windows/disable-windows-updates.ps1
coin/provisioning/common/windows/install-notepad++.ps1
+1
-6
coin/provisioning/common/windows/install-notepad++.ps1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+2
-2
...isioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+1
-1
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
+1
-2
...isioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
with
25 additions
and
14 deletions
coin/platform_configs/default.txt
+
1
−
1
View file @
45528e68
...
...
@@ -12,7 +12,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
...
...
This diff is collapsed.
Click to expand it.
coin/provisioning/common/windows/disable-windows-updates.ps1
+
19
−
2
View file @
45528e68
...
...
@@ -33,5 +33,22 @@
# This script disables the automatic Windows updates
stop-service
wuauserv
set-service
wuauserv
–
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."
}
This diff is collapsed.
Click to expand it.
coin/provisioning/common/windows/install-notepad++.ps1
+
1
−
6
View file @
45528e68
...
...
@@ -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."
This diff is collapsed.
Click to expand it.
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+
2
−
2
View file @
45528e68
...
...
@@ -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."
...
...
This diff is collapsed.
Click to expand it.
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+
1
−
1
View file @
45528e68
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
+
1
−
2
View file @
45528e68
...
...
@@ -40,10 +40,9 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
echo
"Fetching patch for Visual Studio
$version
..."
Copy-Item
$url_cache
$package
$commandLine
=
$package
echo
"Installing Update 5 for Visual Studio
$version
..."
.
$commandLine
/norestart
/passive
Start-Process
-FilePath
$package
-ArgumentList
"
/norestart /passive
"
-Wait
echo
"Removing
$package
..."
remove-item
$package
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets