diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
| commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
| tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | |
| parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
| parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 1a185223..4dd1d40e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -35,4 +35,5 @@ set -ex +# shellcheck source=../common/linux/qnx_660.sh source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" |