diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-11 09:40:10 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-11 15:13:13 +0100 |
commit | 19872ea84352182ee974ff84d2e3872a21427117 (patch) | |
tree | 00caf2a62eb8eb3c4fddb536f559e66ed77428e8 /coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | |
parent | 271fedaf88465d9b28dd3d2ce74acfc6d05a5633 (diff) | |
parent | 3e96fec2e148f39a9ec298a60bd331b6c19214da (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.
Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index f879d756..a0611154 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -44,10 +44,10 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" -# shellcheck source=../common/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/install_xcode.sh" +# 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_8.3.3.xz 8.3.3 |