diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
| commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
| tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/provisioning/common/cmake_linux.sh | |
| parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/provisioning/common/cmake_linux.sh')
| -rwxr-xr-x | coin/provisioning/common/cmake_linux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index c23cf9b2..701d9081 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -37,8 +37,8 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +# shellcheck source=InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" |