diff options
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | 4 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 index aa380a09..1d928ffa 100644 --- a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -2,10 +2,10 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 3850cfea..663d5903 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -2,8 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable -zlib/1.2.11@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake @@ -22,8 +21,6 @@ libxslt:shared=True libjpeg-turbo:shared=False -zlib:shared=False - [imports] bin, icudt65.dll -> ./bin bin, icuin65.dll -> ./bin |