diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
| commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
| tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/provisioning/qtci-osx-10.10-x86_64 | |
| parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
| parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/provisioning/qtci-osx-10.10-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh |