diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-08 09:10:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-08 09:10:04 +0100 |
| commit | ae27f21d2697edf0b513b2c52bb1ecbbe658053b (patch) | |
| tree | e4e52106e657678b9d4f866e7e66cca1aaef726b /coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh | |
| parent | 2a5f8edda67f9bfa0e742d913567c544fa9eda5f (diff) | |
| parent | b3f160bc3955378bb85bd8b28ba1da9118f5457e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
coin/platform_configs/default.yaml
Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh index cf312ed2..57a86c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh @@ -2,5 +2,6 @@ set -ex -# shellcheck source=../common/macos/install_openssl_111a.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh" +# shellcheck source=../common/macos/install_openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" + |