diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-05 22:50:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-05 22:58:09 +0100 |
| commit | 89d4dec81886a5e2d1e7537195f8677146666c85 (patch) | |
| tree | 2e2ce8ef360b8014ffa403e612d86df7b1cfedac | |
| parent | b9b259fd405be7f208851369d0be2f40f90662be (diff) | |
| parent | a742af96fb2b09870a02b0ef33bfed9949bc44ba (diff) | |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Conflicts:
.gitmodules
Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh new file mode 100755 index 00000000..ddfc88a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake_linux.sh + |