qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Provisioning: update Conan and Conan packages to latest versions	Konstantin Tokarev	2020-02-22	1	-7/+7
\| \| \| \| \| \|	Task-number: QTQAINFRA-3556 Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
*	Provisioning: update Conan and Conan packages	Konstantin Tokarev	2019-07-26	1	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \|	[] 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>
*	Updated conan to 0.16.0	Konstantin Tokarev	2016-11-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	* Use --no-imports when installing packages, imports will be performed on "make install" step with new "conan imports" command. * Add txt generator to all conanfiles because it will be needed for "conan imports". Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Added conan zlib package for MinGW on Windows 7	Konstantin Tokarev	2016-11-23	1	-0/+2
\| \| \| \| \|	Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7	Konstantin Tokarev	2016-11-16	1	-0/+19
	Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>