diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
commit | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch) | |
tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | |
parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
parent | 2fb0e4f3521327d7d44b012316fb9e79c11f4366 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.
Conflicts:
.gitmodules
Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/11-conan.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 new file mode 100644 index 00000000..aa380a09 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\conan.ps1" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86 ` + -Arch x86 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "dwarf2" ` + -CompilerThreads "posix" |