summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-05-28 10:22:03 +0200
committerLiang Qi <liang.qi@qt.io>2020-05-28 10:22:03 +0200
commitc1c44574f658ab7e9c0ce9e59404f1b2dc97542c (patch)
tree8bcbe9a51e2ef06a559f24f26a9d6c56956e0ed2 /coin
parent9a4fc7074c72b1c7bb8bf2dd2f3886aa87d04530 (diff)
parent717364e3e10f39f602545c080f34baa064760b7a (diff)
downloadqt5-c1c44574f658ab7e9c0ce9e59404f1b2dc97542c.tar.gz
Merge remote-tracking branch 'origin/5.15.0' into 5.15
Conflicts: coin/provisioning/common/linux/qnx_700.sh coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 Change-Id: Ic7ed52251573824595821c53025323287d60b536
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/common/linux/qnx_700.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps14
4 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh
index b0424529..f344c275 100755
--- a/coin/provisioning/common/linux/qnx_700.sh
+++ b/coin/provisioning/common/linux/qnx_700.sh
@@ -41,8 +41,8 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-linux.tar.xz"
-sha1="a92f2d6c649aa03e91a216dfa9df003fa00c033e"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
+sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
folderName="qnx700"
targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
index f134951a..7552c5ad 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
@@ -36,7 +36,7 @@
# This script installs QNX 7.
targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
folderName="qnx700"
sudo mkdir -p "$targetFolder"
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
index 7f1f1233..570e67cb 100755
--- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
@@ -36,7 +36,7 @@
# This script installs QNX 7.
targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20200326-macos.tar.xz"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
folderName="qnx700"
sudo mkdir -p "$targetFolder"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 986416fd..49b71837 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -36,10 +36,10 @@
# This script installs QNX SDP 7.0
$zip = Get-DownloadLocation "qnx700.7z"
-$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20200326-windows.7z"
+$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z"
Download $url $url $zip
-Verify-Checksum $zip "ac3e780ba2fc68932d7f23c51bdc646d03e2e91f"
+Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d"
Extract-7Zip $zip C:\
Set-EnvironmentVariable "QNX_700" "C:\QNX700"