diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
| commit | ebf8aa15e67caacab514ea93782ff0783d60af2d (patch) | |
| tree | ecbaf2c3669d1de878ead56e8b44a83bff65efdc /coin/provisioning/qtci-osx-10.8-x86_64 | |
| parent | d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff) | |
| parent | dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
Diffstat (limited to 'coin/provisioning/qtci-osx-10.8-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh deleted file mode 100755 index d257ffa1..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh |