qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Provisioning: move Conan manifests to common directory	Konstantin Tokarev	2017-07-09	8	-779/+0
\| \| \| \| \| \| \| \| \|	We need to use x86 packages from qtci-windows-10-x86_64 configuration, so splitting Conan manifests by configuration is not a good idea anymore. Task-number: QTBUG-61829 Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f Reviewed-by: Simon Hausmann <simon.hausmann@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	3	-0/+62
\| \| \| \| \|	Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Fixed broken conan manifest in qtci-windows-7-x86	Konstantin Tokarev	2016-11-18	1	-2/+2
\| \| \| \| \|	Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a 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	4	-630/+649
\| \| \| \| \|	Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Verify conan manifests when installing packages	Konstantin Tokarev	2016-11-16	6	-0/+719
	This check allows us to ensure authenticity of installed files. Manifests are sorted to minimize diffs in future updates. Manifests lack trailing newline, because adding it would break manifest parser of conan 0.15.0. Task-number: QTQAINFRA-998 Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>