lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
This commit is contained in:
Liang Qi
2018-08-21 09:26:11 +02:00
parent f8086955b3 92088b295c
commit 5360fc7fcf
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/mqtt_broker.sh
View File

@@ -39,10 +39,10 @@
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd"
SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"

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

@@ -35,8 +35,8 @@
Write-Host "MQTT: Downloading Paho test broker..."
$zip = Get-DownloadLocation "pahotest.zip"
$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65"
$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd"
$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"

8
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
View File

@@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt..."
versionARM="2.3.4"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2f17ab3.sh"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
SHA1="7cd306769f79a202b6528d12e12f75eac4672748"
SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56"
yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
yoctoLocationARMv7="/opt/yocto-armv7"
sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -61,10 +61,10 @@ rm -rf "$yoctoInstaller"
echo "Installing Yocto toolchain for 64-bit b2qt..."
versionARM64="2.3.4"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2f17ab3.sh"
package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
SHA1="f7219a26192af772743a8fe9c5cb6168e42d68f1"
SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d"
yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
yoctoLocationARM64="/opt/yocto-arm64"
sysrootARM64="sysroots/aarch64-poky-linux"

8
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
View File

@@ -19,9 +19,15 @@ echo "Set DISPLAY"
echo 'export DISPLAY=":0"' >> ~/.bashrc
echo "Disabling file indexing."
sudo balooctl disable
echo "Disable update notifications"
while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do
echo "Waiting for PackageKit to finish..."
sleep 0.5
done
echo "Disabling update notifications"
sudo zypper -nq remove plasma5-pk-updates
# shellcheck disable=SC2031
if [ "$http_proxy" != "" ]; then
sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy

2
coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh
View File

@@ -50,4 +50,4 @@ set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.3.1.tar.gz 9.3.1
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.4.1.tar.gz 9.4.1

4
coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
View File

@@ -37,10 +37,10 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="9.3"
version="9.4.1"
packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg"
url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName"
sha1="3c0306d3faa1131550f1539feeeb5aa6c985763a"
sha1="efe51c11c2c99a5f1a98bbd3772dc3fa3ce78904"
InstallCommandLineTools $url $url $sha1 $packageName $version