diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-12 12:51:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-12 21:13:56 +0100 |
| commit | c2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch) | |
| tree | 35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh | |
| parent | ab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff) | |
| parent | 19872ea84352182ee974ff84d2e3872a21427117 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh')
| -rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh | 4 |
1 files changed, 0 insertions, 4 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 deleted file mode 100755 index b05dcf1c..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh |