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

Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev

Browse Source
This commit is contained in:
Liang Qi
2018-05-31 16:48:26 +00:00
committed by The Qt Project
parent 21a37fe009 0a2465bc30
commit 154c24cc4f
18 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/qt5.txt
View File

@@ -17,6 +17,6 @@ qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAnd
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

2
coin/provisioning/common/linux/open62541.sh
View File

@@ -59,7 +59,7 @@ sudo pip install six
git clone https://github.com/open62541/open62541.git open62541 git clone https://github.com/open62541/open62541.git open62541
cd open62541 cd open62541
git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629 git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7
mkdir build mkdir build
cd build cd build
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 .. cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..

7
coin/provisioning/common/unix/libclang.sh
View File

@@ -42,6 +42,7 @@ set -e
# shellcheck source=./check_and_set_proxy.sh # shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
# shellcheck source=../shared/sw_versions.txt # shellcheck source=../shared/sw_versions.txt
@@ -70,3 +71,9 @@ sudo mv /tmp/libclang "$destination"
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
echo "libClang = $version" >> ~/versions.txt echo "libClang = $version" >> ~/versions.txt
if [ "$version" == "6.0" ]; then
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
fi

3
coin/provisioning/common/windows/3dstudio_3rdparty.ps1
View File

@@ -1,6 +1,7 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" $zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip" $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
Download $url $url $zip Download $url $url $zip

2
coin/provisioning/common/windows/android-openssl.ps1
View File

@@ -40,7 +40,7 @@
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2o" $version = "1.0.2o"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691" $sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
$destination = "C:\Utils\openssl-android-master" $destination = "C:\Utils\openssl-android-master"

2
coin/provisioning/common/windows/cmake.ps1
View File

@@ -36,7 +36,7 @@
$majorminorversion = "3.6" $majorminorversion = "3.6"
$version = "3.6.2" $version = "3.6.2"
$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"

11
coin/provisioning/common/windows/helpers.ps1
View File

@@ -68,6 +68,17 @@ function BadParam
throw("You must specify $Description") throw("You must specify $Description")
} }
function Get-DefaultDownloadLocation
{
return $env:USERPROFILE + "\downloads\"
}
function Get-DownloadLocation
{
Param ([string]$TargetName = $(BadParam("a target filename")))
return (Get-DefaultDownloadLocation) + $TargetName
}
function Download function Download
{ {
Param ( Param (

2
coin/provisioning/common/windows/jom.ps1
View File

@@ -1,6 +1,6 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\jom_1_1_2.zip" $zip = Get-DownloadLocation "jom_1_1_2.zip"
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4" Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"

8
coin/provisioning/common/windows/libclang.ps1
View File

@@ -16,7 +16,7 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
$libclang_version = $libclang_version -replace '["."]' $libclang_version = $libclang_version -replace '["."]'
} }
$zip = "c:\users\qt\downloads\libclang.7z" $zip = Get-DownloadLocation "libclang.7z"
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
function setURL() { function setURL() {
@@ -86,3 +86,9 @@ if ( $setDefault ) {
} }
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_") Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
Write-Output "libClang = $libclang_version" >> ~/versions.txt Write-Output "libClang = $libclang_version" >> ~/versions.txt
if ( $libclang_version -eq "60" ) {
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
}

2
coin/provisioning/common/windows/libusb.ps1
View File

@@ -35,7 +35,7 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z" $archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
$libusb_location = "C:\Utils\libusb-1.0" $libusb_location = "C:\Utils\libusb-1.0"
Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive

2
coin/provisioning/common/windows/mqtt_broker.ps1
View File

@@ -34,7 +34,7 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
Write-Host "MQTT: Downloading Paho test broker..." Write-Host "MQTT: Downloading Paho test broker..."
$zip = "c:\users\qt\downloads\pahotest.zip" $zip = Get-DownloadLocation "pahotest.zip"
$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" $externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" $internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
$sha1 = "532fe145096cdd8d679f425cbfd883289150c968" $sha1 = "532fe145096cdd8d679f425cbfd883289150c968"

2
coin/provisioning/common/windows/ninja.ps1
View File

@@ -1,6 +1,6 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip" $zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2" Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"

9
coin/provisioning/common/windows/winrtrunner.ps1
View File

@@ -1,10 +1,11 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\winrtrunner.zip" $zip = Get-DownloadLocation "winrtrunner.zip"
$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" $url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner_2018-05-24.zip"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winrtrunner\winrtrunner_2018-05-24.zip"
Download $url $url $zip Download $url $url_cache $zip
Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" Verify-Checksum $zip "b83f2166b5799910a661d1db02771edf94880785"
Extract-7Zip $zip C:\Utils\winrtrunner Extract-7Zip $zip C:\Utils\winrtrunner
Remove-Item -Path $zip Remove-Item -Path $zip

43
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh Executable file
View File

@@ -0,0 +1,43 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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$
##
#############################################################################
set -ex
BASEDIR=$(dirname "$0")
# With RHEL 6.6 we are using different lib clang than others
VERSION=4.0
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

1
coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1
View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\set-proxy.ps1"

1
coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1
View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\unset-proxy.ps1"

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

@@ -35,7 +35,7 @@
# This script installs QNX SDP 7.0 # This script installs QNX SDP 7.0
$zip = "c:\users\qt\downloads\qnx700.7z" $zip = Get-DownloadLocation "qnx700.7z"
$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" $url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z"
Download $url $url $zip Download $url $url $zip

2
coin/provisioning/qtci-windows-7-x86/04-msys.ps1
View File

@@ -5,7 +5,7 @@
$version = "1.0.11" $version = "1.0.11"
$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" $url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z"
$zip = "c:\users\qt\downloads\msys-$version.7z" $zip = Get-DownloadLocation ("msys-$version.7z")
$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
$destination = "C:\msys" $destination = "C:\msys"