diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
| commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
| tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | |
| parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
| parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 index 14a5a085..553f9560 100644 --- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 @@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" $destination = "C:\Utils\openssl-android-master" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils |