diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-14 11:43:35 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-10-02 17:12:18 +0300 |
| commit | b5eb36d6892387996e4ce971649a65e31d704b55 (patch) | |
| tree | 0708087ea511d4a23373b54b3fffaa5b5fe1773c /coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | |
| parent | d6e8e788e50ca9ffe9861b73bee5fa6e4bb5e511 (diff) | |
Provisioning: Update Conan packages
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now
Task-bumber: QTQAINFRA-3916
Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit 27d187eb3259842d506bb8e35691aa4748f99025)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 5 |
1 files changed, 1 insertions, 4 deletions
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 |