diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 09:40:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-11 15:13:13 +0100 |
| commit | 19872ea84352182ee974ff84d2e3872a21427117 (patch) | |
| tree | 00caf2a62eb8eb3c4fddb536f559e66ed77428e8 /coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | |
| parent | 271fedaf88465d9b28dd3d2ce74acfc6d05a5633 (diff) | |
| parent | 3e96fec2e148f39a9ec298a60bd331b6c19214da (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.
Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/03-conan.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 index 163739fa..807e5480 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` |