mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-26 22:58:17 +08:00
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
This commit is contained in:
Liang Qi
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\disable-sleep.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\disable-windefender.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\wsearch-off.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\openssl.ps1"
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\disable-ntp.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\install-notepad++.ps1"
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\python.ps1" 64
|
||||
. "$PSScriptRoot\..\common\windows\python.ps1" 64
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\03-conan.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\03-conan.ps1"
|
||||
|
||||
Run-Conan-Install `
|
||||
-ConanfilesDir "$PSScriptRoot\conanfiles" `
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-sevenzip.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\fbx_windows.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
# This script installs QNX SDP 7.0
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\ninja.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\ninja.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-git.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-git.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-jdk.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\libclang.ps1" 64
|
||||
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64
|
||||
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\python3.ps1" 64
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\install-mingw.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
|
||||
|
||||
# This script will install 64-bit MinGW 5.3.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
. "$PSScriptRoot\..\common\install-mingw.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
|
||||
|
||||
# This script will install 64-bit MinGW 6.3.0
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-ruby.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
|
||||
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\openssl.ps1"
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\set-network-test-server.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
|
||||
|
||||
@@ -1 +1 @@
|
||||
. "$PSScriptRoot\..\common\vulkansdk.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"
|
||||
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\icu.ps1"
|
||||
@@ -30,5 +30,5 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\fbx_windows.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\jom.ps1"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\cmake.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
|
||||
@@ -0,0 +1,51 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
# This script will install VirtualBox
|
||||
|
||||
$version = "5.2.4"
|
||||
$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96"
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe"
|
||||
$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe"
|
||||
$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe"
|
||||
|
||||
Download $url_official $url_cache $virtualboxPackage
|
||||
Verify-Checksum $virtualboxPackage $sha1
|
||||
Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait
|
||||
|
||||
echo "Cleaning $virtualboxPackage.."
|
||||
Remove-Item -Recurse -Force "$virtualboxPackage"
|
||||
|
||||
echo "VirtualBox = $version" >> ~\versions.txt
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\libusb.ps1"
|
||||
2
coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
Normal file
2
coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
Normal file
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\mysql.ps1"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
. "$PSScriptRoot\..\common\windows\postgresql.ps1"
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
# Signing tools are needed to sign offline installers when releasing
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\cmake.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\icu.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\jom.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\libusb.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\mqtt_broker.ps1"
|
||||
@@ -1,2 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\mysql.ps1"
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\postgresql.ps1"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\python3.ps1" 64
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\ruby.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\winrtrunner.ps1"
|
||||
Reference in New Issue
Block a user