diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:10:00 +0200 |
| commit | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (patch) | |
| tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/provisioning/common/linux/qnx_700.sh | |
| parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
| parent | 42366fd7405f778d3b80f9de2f593ff18f52e0f9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.
Conflicts:
coin/platform_configs/default.yaml
Temporarily remove the -no-opengl build.
coin/platform_configs/meta-boot2qt.yaml
coin/platform_configs/qt5.yaml
Temporarily remove the webassembly build on windows.
coin/platform_configs/qtwebkit.yaml
Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
Diffstat (limited to 'coin/provisioning/common/linux/qnx_700.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 3c821fec..02cd57d3 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-20180801-linux.tar.xz" -sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" +sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" |