diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-27 10:26:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-27 10:26:38 +0200 |
| commit | 1cfc052b9dfac1caf233c96adc1ffe766ad03a00 (patch) | |
| tree | acd56923189e6e7b0998185f3d05009361187e74 /coin/provisioning/qtci-windows-10-x86_64 | |
| parent | 36d633f2fd4bfefb1c040a7c68436571b8e07d0c (diff) | |
| parent | 0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 | 6 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index ded894a5..7c4cd8ac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -2,9 +2,9 @@ # This script will install MinGW 5.3.0 -$version = "5.3.0" -$release = "release-posix-dwarf-rt_v4-rev0" +$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" +$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" -InstallMinGW $version $release +InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index a2710760..e11f2310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -2,7 +2,7 @@ # This script will install MinGW 6.3.0 -$version = "6.3.0" -$release = "release-posix-dwarf-rt_v5-rev2" +$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" +$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" -InstallMinGW $version $release +InstallMinGW $release $sha1 |