diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-29 15:34:40 +0300 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-11-30 15:31:52 +0000 |
commit | 7dc66c95289a2b34e88b4e93daa8fff38d918175 (patch) | |
tree | 627285fa31d27e1a71f74dc017368fec5f253629 /coin/provisioning/qtci-windows-7-x86/conanfiles | |
parent | ad1fc7cc5dcbd391339cbcf84843d28b71629a3d (diff) |
Updated conan to 0.16.0
* 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>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/conanfiles')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 4253ef09..4a5bc05d 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -6,6 +6,7 @@ zlib/1.2.8@annulen/stable [generators] cmake +txt [options] icu:shared=True |