lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-27 15:16:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: update Conan and Conan packages

Browse Source 
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Konstantin Tokarev
2019-07-26 18:57:59 +03:00
parent 4bf0ba2ba1
commit 716640a477
61 changed files with 2925 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
View File

@@ -1,7 +1,8 @@
[requires]
icu/59.1@vitallium/stable
libxml2/2.9.4@vitallium/stable
libxslt/1.1.29@vitallium/stable
icu/64.2@qtproject/stable
libxml2/2.9.9@qtproject/stable
libxslt/1.1.33@qtproject/stable
libjpeg-turbo/2.0.2@qtproject/stable
[generators]
cmake
@@ -9,12 +10,20 @@ txt
[options]
icu:shared=True
icu:data_packaging=library
libxml2:shared=True
libxml2:iconv=False
libxml2:icu=True
libxml2:zlib=False
libxslt:shared=True
libjpeg-turbo:shared=False
[imports]
bin, icudt59.dll -> ./bin
bin, icuin59.dll -> ./bin
bin, icuuc59.dll -> ./bin
lib, icudt64.dll -> ./bin
lib, icuin64.dll -> ./bin
lib, icuuc64.dll -> ./bin
bin, libxml2.dll -> ./bin
bin, libxslt.dll -> ./bin