diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
| commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
| tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/common/windows/install-gnuwin32.ps1 | |
| parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
| parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/common/windows/install-gnuwin32.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/install-gnuwin32.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 index 99862b3c..6acede79 100644 --- a/coin/provisioning/common/windows/install-gnuwin32.ps1 +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -44,3 +44,4 @@ Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" Extract-7Zip "$temp\$zipPackage" C:\Utils Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt +Prepend-Path "C:\Utils\gnuwin32\bin" |