mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
This commit is contained in:
Jani Heikkinen
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -11,7 +11,7 @@
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtxmlpatterns
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.9
|
||||
@@ -100,7 +100,7 @@
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtsvg
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.9
|
||||
@@ -160,7 +160,7 @@
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtxmlpatterns
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = dev
|
||||
|
||||
@@ -15,6 +15,29 @@ function Verify-Checksum
|
||||
}
|
||||
}
|
||||
|
||||
function Extract-7Zip
|
||||
{
|
||||
Param (
|
||||
[string]$Source,
|
||||
[string]$Destination
|
||||
)
|
||||
echo "Extracting '$Source' to '$Destination'..."
|
||||
|
||||
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
|
||||
$zipExe = join-path ${env:ProgramFiles(x86)} '7-zip\7z.exe'
|
||||
if (-not (test-path $zipExe)) {
|
||||
$zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe'
|
||||
if (-not (test-path $zipExe)) {
|
||||
throw "Could not find 7-zip."
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$zipExe = "7z.exe"
|
||||
}
|
||||
|
||||
& $zipExe x $Source "-o$Destination" -y
|
||||
}
|
||||
|
||||
function Extract-Zip
|
||||
{
|
||||
Param (
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$zip = "c:\users\qt\downloads\jom_1_1_0.zip"
|
||||
$zip = "c:\users\qt\downloads\jom_1_1_2.zip"
|
||||
|
||||
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
|
||||
Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
|
||||
Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
|
||||
Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
|
||||
Extract-Zip $zip C:\Utils\Jom
|
||||
|
||||
[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")
|
||||
|
||||
47
coin/provisioning/common/libusb.ps1
Normal file
47
coin/provisioning/common/libusb.ps1
Normal file
@@ -0,0 +1,47 @@
|
||||
#############################################################################
|
||||
#
|
||||
# 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$
|
||||
#
|
||||
############################################################################
|
||||
|
||||
# lisbusb-1.0 is needed by tqtc-boot2qt/qdb
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$archive = "C:\users\qt\downloads\libusb-1.0.21.7z"
|
||||
$libusb_location = "C:\Utils\libusb-1.0"
|
||||
|
||||
Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z http://ci-files01-hki.ci.local/input/libusb-1.0/libusb-1.0.21.7z $archive
|
||||
Verify-Checksum $archive "37c8884a0ddca97d492b8ef3e08970ae3ba20653"
|
||||
|
||||
Extract-7Zip $archive $libusb_location
|
||||
|
||||
# Tell tqtc-boot2qt/qdb build system where to find libusb
|
||||
[Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine")
|
||||
49
coin/provisioning/common/linux-removethemall.sh
Executable file
49
coin/provisioning/common/linux-removethemall.sh
Executable file
@@ -0,0 +1,49 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script removes preinstalled sw.
|
||||
# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script
|
||||
|
||||
function RemoveDir {
|
||||
targetFolder=$1
|
||||
|
||||
if [ -d "$targetFolder" ]; then
|
||||
echo "Removing existing $targetFolder..."
|
||||
sudo rm -fr "$targetFolder"
|
||||
fi
|
||||
}
|
||||
|
||||
# Android
|
||||
RemoveDir /opt/android
|
||||
43
coin/provisioning/common/version.sh
Executable file
43
coin/provisioning/common/version.sh
Executable file
@@ -0,0 +1,43 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script will print all installed software to provision log.
|
||||
# Script needs to be named so that it will be ran at last during provisioning
|
||||
|
||||
# Print all build machines versions to provision log
|
||||
echo "*********************************************"
|
||||
echo "***** SW VERSIONS *****"
|
||||
cat ~/versions.txt
|
||||
echo "*********************************************"
|
||||
@@ -48,23 +48,24 @@ targetFolder="/opt/android"
|
||||
baseUrl="http://ci-files01-hki.ci.local/input/android"
|
||||
|
||||
# SDK
|
||||
sdkVersion="android-sdk_r24.4.1-linux.tgz"
|
||||
sdkPackage="android-sdk_r24.4.1-linux.tgz"
|
||||
sdkBuildToolsVersion="23.0.3"
|
||||
sdkApiLevel="android-21"
|
||||
sdkUrl="$baseUrl/$sdkVersion"
|
||||
sdkUrl="$baseUrl/$sdkPackage"
|
||||
sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
|
||||
sdkTargetFile="$targetFolder/$sdkVersion"
|
||||
sdkTargetFile="$targetFolder/$sdkPackage"
|
||||
sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
|
||||
sdkFolderName="android-sdk-linux"
|
||||
sdkName="sdk"
|
||||
|
||||
# NDK
|
||||
ndkVersion="android-ndk-r10e-linux-x86_64.zip"
|
||||
ndkUrl="$baseUrl/$ndkVersion"
|
||||
ndkVersion="r10e"
|
||||
ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
|
||||
ndkUrl="$baseUrl/$ndkPackage"
|
||||
ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
|
||||
ndkTargetFile="$targetFolder/$ndkVersion"
|
||||
ndkTargetFile="$targetFolder/$ndkPackage"
|
||||
ndkExtract="unzip $ndkTargetFile -d $targetFolder"
|
||||
ndkFolderName="android-ndk-r10e"
|
||||
ndkFolderName="android-ndk-$ndkVersion"
|
||||
ndkName="ndk"
|
||||
|
||||
function InstallAndroidPackage {
|
||||
@@ -77,25 +78,37 @@ function InstallAndroidPackage {
|
||||
folderName=$7
|
||||
name=$8
|
||||
|
||||
sudo wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
|
||||
sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
|
||||
echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
|
||||
sudo chmod 755 $targetFile
|
||||
sudo chmod 755 "$targetFile"
|
||||
sudo $extract || echo "Failed to extract $url"
|
||||
sudo chown -R qt:users $targetFolder/$folderName
|
||||
sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
|
||||
sudo rm -fr $targetFolder/$version
|
||||
sudo chown -R qt:users "$targetFolder"/"$folderName"
|
||||
sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name"
|
||||
sudo rm -fr "$targetFolder"/"$version"
|
||||
}
|
||||
|
||||
sudo mkdir $targetFolder
|
||||
sudo mkdir "$targetFolder"
|
||||
# Install Android SDK
|
||||
echo "Installing Android SDK version $sdkVersion..."
|
||||
InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
|
||||
echo "Installing Android SDK version $sdkPackage..."
|
||||
InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
|
||||
|
||||
# Install Android NDK
|
||||
echo "Installing Android NDK version $ndkVersion..."
|
||||
InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
|
||||
echo "Installing Android NDK version $ndkPackage..."
|
||||
InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
|
||||
|
||||
# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
|
||||
echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
|
||||
echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
|
||||
echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
|
||||
|
||||
echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
|
||||
|
||||
# Storage version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
echo "***** Android SDK *****" >> ~/versions.txt
|
||||
echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
|
||||
echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt
|
||||
platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)"
|
||||
echo "Android Platform Tools = $platformTools" >> ~/versions.txt
|
||||
sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)"
|
||||
echo "Android SDK Tools = $sdkTools" >> ~/versions.txt
|
||||
echo "***** Android NDK *****" >> ~/versions.txt
|
||||
echo "Android NDK Version = $ndkVersion" >> ~/versions.txt
|
||||
44
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
Normal file
44
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
Normal file
@@ -0,0 +1,44 @@
|
||||
#!/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script needs to be called last during provisioning so that the software information will show up last in provision log.
|
||||
|
||||
# Storage installed RPM packages information
|
||||
echo "*********************************************" >> ~/versions.txt
|
||||
echo "***** All installed RPM packages *****" >> ~/versions.txt
|
||||
rpm -q -a | sort >> ~/versions.txt
|
||||
echo "*********************************************" >> ~/versions.txt
|
||||
|
||||
$(dirname $0)/../common/version.sh
|
||||
1
coin/provisioning/qtci-windows-10-x86/libusb.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86/libusb.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\libusb.ps1"
|
||||
1
coin/provisioning/qtci-windows-7-x86/libusb.ps1
Normal file
1
coin/provisioning/qtci-windows-7-x86/libusb.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\libusb.ps1"
|
||||
1
coin/provisioning/qtci-windows-8-x86/libusb.ps1
Normal file
1
coin/provisioning/qtci-windows-8-x86/libusb.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\libusb.ps1"
|
||||
Reference in New Issue
Block a user