diff options
author | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-08-30 09:50:50 +0200 |
commit | 1b65a5d73a8e3a411093f4c0f1f4803eb2d08e54 (patch) | |
tree | 3669e803153df25221aaeaa81500711fb7ba4fab /coin/provisioning/qtci-windows-10-x86_64 | |
parent | e89420945f368ec7b6d03b8aeb6e6b478ee960fe (diff) | |
parent | 5a2a93ddf48465f37c116ef93f66682d789a61fc (diff) | |
download | qt5-1b65a5d73a8e3a411093f4c0f1f4803eb2d08e54.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 821c513e..74c8dc6b 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" Download $url $url $zip -Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" +Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" |