qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Provisioning: Temporary fix for installing Conan packages in Windows	Heikki Halmet	2021-05-12	1	-68/+0
\| \| \| \| \| \| \| \| \| \|	Pick-to: 6.1 Pick-to: 6.0 Pick-to: 5.15 Pick-to: 5.12 Task-number: QTQAINFRA-4443 Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
*	Provisioning: Update Conan packages	Konstantin Tokarev	2020-09-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \|	* 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: Ib3355265dc35326d30eacb60d0e3c97f06e6f9be Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
*	Provisioning: Install Conan packages for VS2019	Konstantin Tokarev	2020-03-05	1	-0/+16
\| \| \| \| \|	Change-Id: Ibbee96ea7ad9e054e1521c897206c9863acc9c08 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
*	Provisioning: update Conan and Conan packages	Konstantin Tokarev	2019-07-26	1	-0/+53
	[] Update Conan to 1.17.0, adjust to change in command line arguments [] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>