lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-24 07:11:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,308 Commits 120 Branches 273 Tags
e1bfa77391fcf3d50f0d9f9375f5d123710395cf
Commit Graph

3 Commits

Author SHA1 Message Date
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