diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-27 15:18:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-27 15:18:06 +0200 |
commit | 9d3f29dc03188d80a8705e0706e2b93a93977711 (patch) | |
tree | 0f4c77d1449efc651d47d0aa5166b5cbe9430d1b /coin/provisioning/qtci-windows-10-x86_64 | |
parent | a0291fde84cd44e7d05a7f7a1946b64e537fd796 (diff) | |
parent | 7ef9985e4eef550aaa7ee40d6916507bc943781d (diff) |
Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 index 25c6f28a..25c6f28a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 |