diff options
author | Liang Qi <liang.qi@qt.io> | 2018-05-09 22:10:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-05-09 22:12:22 +0200 |
commit | b1f1bf55601d061964c84622eb4f8092e1b0f30b (patch) | |
tree | 52a52ff0b260b7bbf5d9189c927f023a1cfba82a /coin/provisioning/qtci-windows-10-x86_64 | |
parent | 1989bc105d4a0a154e252ea438f30ea2894f998c (diff) | |
parent | b1b04fcb1aa2f2cd55db258ac30824260485d25a (diff) | |
download | qt5-b1f1bf55601d061964c84622eb4f8092e1b0f30b.tar.gz |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 index f7a722d7..62f11292 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 @@ -1 +1,3 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015 |