6 Commits

Author	SHA1	Message	Date
Konstantin Tokarev	680c596ca0	Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR" ... This actually breaks conan integration in Coin instead of fixing it. This reverts commit b0b0c9c471. Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-10-01 06:35:46 +00:00
Konstantin Tokarev	b0b0c9c471	Changed slash direction in CI_CONAN_BUILDINFO_DIR ... Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-09-26 13:51:15 +00:00
Konstantin Tokarev	23d1112839	Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows ... Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-09-18 05:57:54 +00:00
Konstantin Tokarev	e1bfa77391	Do not use qmake and cmake generator automatically for each conanfile ... Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-09-17 11:06:44 +00:00
Konstantin Tokarev	78a764ee65	Install conan dependencies if there is conanfile.txt for module ... Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2016-09-14 22:31:17 +00:00
Konstantin Tokarev	99ff42545f	Install Conan on Win10 ... 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>	2016-09-14 22:31:01 +00:00