diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | |
parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh new file mode 100755 index 00000000..d7abd285 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -0,0 +1 @@ +$(dirname $0)/../common/cmake_linux.sh |