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

Merge remote-tracking branch 'origin/5.12' into 5.13

Browse Source 
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
This commit is contained in:
Liang Qi
2019-04-13 11:38:39 +02:00
parent 869c15629d f31970d5ac
commit 8710c7d9cf
67 changed files with 207 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
View File

@@ -175,7 +175,7 @@ waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory
pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
View File

@@ -34,6 +34,7 @@
set -ex
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# build latest qemu to usermode

4
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
View File

@@ -37,7 +37,9 @@
set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
@@ -96,7 +98,7 @@ rm -rf "$yoctoInstaller"
if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" -a -e "$yoctoLocationMIPS64/$sysrootMIPS64" -a -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && [ -e "$yoctoLocationMIPS64/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
View File

@@ -35,6 +35,7 @@
set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/openssl_for_android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
View File

@@ -33,4 +33,7 @@
##
#############################################################################
set -ex
# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/docker.sh
"$BASEDIR/../common/linux/docker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
View File

@@ -1,3 +1,4 @@
#!/bin/bash
# shellcheck source=../common/linux/squish-coco.sh
source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/ubuntu-version.sh
"$BASEDIR/../common/linux/ubuntu-version.sh"