qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename conan.ps1 and python.ps1 file in configuration dirs too	Konstantin Tokarev	2016-11-18	1	-9/+0
\| \| \| \| \| \| \| \|	Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Install conan from pip instead of exe	Konstantin Tokarev	2016-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \|	This allows us to get it working on 32-bit Windows. Also renamed conan.ps1 and python.ps1 to get proper provisioning order. Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Pass compiler.runtime setting to conan	Konstantin Tokarev	2016-10-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	When MSVC is not autodected, necessary setting compiler.runtime has undefined value, breaking installation of packages. This setting is not supported by MinGW, so it should be optional. Task-number: QTQAINFRA-998 Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows	Konstantin Tokarev	2016-09-18	1	-1/+1
\| \| \| \| \|	Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Changed BuildinfoDir of conan to use Coin-compatible compiler name	Konstantin Tokarev	2016-09-17	1	-1/+1
\| \| \| \| \| \|	Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Install conan dependencies if there is conanfile.txt for module	Konstantin Tokarev	2016-09-14	1	-0/+7
\| \| \| \| \|	Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Install Conan on Win10	Konstantin Tokarev	2016-09-14	1	-0/+1
	QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>