diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
| commit | 8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch) | |
| tree | 0e60ea439dae4b823bc910fb85cef488754092e1 /coin/provisioning/common/windows/install-breakpad.ps1 | |
| parent | 869c15629d8397bc725c61da423a4a038ef4d395 (diff) | |
| parent | f31970d5ac48cd2ae6601aca32738ea718edb265 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/qt3d-runtime.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
Diffstat (limited to 'coin/provisioning/common/windows/install-breakpad.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/install-breakpad.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt |