diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:30:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 14:04:47 +0200 |
| commit | 14d2852597f7c869e91db2f54d954965af6083fb (patch) | |
| tree | 035bccb3e28f31abef1b1e39a4ca384726d2fb76 /coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | |
| parent | 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 (diff) | |
| parent | 1eae3c41854294216e600f3f4a7dfc3987d30d0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.gitmodules
Ignore qtquick3d for now.
coin/platform_configs/default.txt
coin/platform_configs/default.yaml
coin/platform_configs/qtbase.txt
coin/platform_configs/qtbase.yaml
We use yaml files for configurations now.
Adjust the configurations for Qt6 as it was
done before in the .txt files.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index a7ced8ae..4d9ca4b9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -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,22 @@ 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 +bin, libxml2-2.dll -> ./bin +bin, libxslt-1.dll -> ./bin |