aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2020-09-14 11:43:35 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2020-09-21 09:29:39 +0300
commit27d187eb3259842d506bb8e35691aa4748f99025 (patch)
treee7a77d16f1758b76b129046fbd249c66a474fb95 /coin/provisioning/qtci-windows-10-x86
parent97af11bfa5ce69b9cd13935d868cf823898b01a4 (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: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit c79904c463842937f6b2cc959454d2f59943a08e) Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
-rw-r--r--coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
index 5def5b33..f670b394 100644
--- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -2,7 +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
+libjpeg-turbo/2.0.5@qtproject/stable
[generators]
cmake