diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
| commit | 029cabb7292b4213bf28a6a8808a8ed38689a8d6 (patch) | |
| tree | 94817fbd83cf43e6931effbbe62e85cbb9f8beda /coin/provisioning/qtci-macos-10.13-x86_64 | |
| parent | 67ff8eb9585406fbd781f746e2a00f91ff368301 (diff) | |
| parent | 7143d018dc7f1cbe5b7bd3d5fb5a8dd50fe71589 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I57f8a62c4f146cd1eda26885ce1507c072cb107f
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 d2905e9d..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-20190325-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" |