qt/qt5.git - Qt5 super module

	Commit message (Collapse)	Author	Age	Files	Lines
*	Conan: update ICU to 59.1, added VS2017 packages	Konstantin Tokarev	2017-07-09	1	-0/+3
\| \| \| \| \| \| \| \|	MinGW packages will be upgraded in another patch. Task-number: QTBUG-61728 Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host	Konstantin Tokarev	2017-07-09	1	-1/+1
\| \| \| \| \| \| \| \|	Also upgrade to Conan 0.24.0. Task-number: QTBUG-61829 Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Provisioning: move Conan manifests to common directory	Konstantin Tokarev	2017-07-09	1	-1/+2
\| \| \| \| \| \| \| \| \|	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>
*	Provisioning: Upgrade conan version from 0.16.0 to 0.20.2	Akseli Salovaara	2017-03-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conan provisioning fails on private Coin instance due to error message Could not find a version that satisfies the requirement conan==0.16.0 (from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1, 0.20.2) No matching distribution found for conan==0.16.0 Upgrading to 0.16.1 resulted warning "Your conan's client version is deprecated for the current remote (v0.20.2). Upgrade conan client." and provisioning failed with "ERROR: All remotes failed" After upgrade to 0.20.2 conan provisioning script is working again. Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
*	Copy conanfile to conanbuildinfos directory	Konstantin Tokarev	2016-11-30	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conanfile is required for running "conan imports" as a part of "make install" procedure, however its original location is unknown to build system of module. Conanfile is copied with its conventional name "conanfile.txt" to avoid tying module build system to more qt5.git layout peculiarities. In future we may want to have several conanfiles in one provisioning dir, like qtwebkit-mingw.txt and qtwebkit-msvc.txt. Also simplified syntax of PowerShell variables interpolation, $() is needed only for interpolating expressions. Task-number: QTQAINFRA-998 Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Updated conan to 0.16.0	Konstantin Tokarev	2016-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	* 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>
*	Use full paths for invoking stuff from Python27\Scripts	Konstantin Tokarev	2016-11-18	1	-2/+4
\| \| \| \| \|	Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Provisioning should fail in case of conan errors	Konstantin Tokarev	2016-11-18	1	-2/+9
\| \| \| \| \|	Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
*	Install conan from pip instead of exe	Konstantin Tokarev	2016-11-16	1	-0/+46
	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>