diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-20 14:10:00 +0200 |
| commit | 9a8fb868ec2c526325408a4cbf3e628aa3377e30 (patch) | |
| tree | c5f319b851ce3c76664cd27133bfb874f265abd7 /coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt | |
| parent | c63dd0ddfdf1467e2f08cb1c9769142be1420ca5 (diff) | |
| parent | 42366fd7405f778d3b80f9de2f593ff18f52e0f9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52.
Conflicts:
coin/platform_configs/default.yaml
Temporarily remove the -no-opengl build.
coin/platform_configs/meta-boot2qt.yaml
coin/platform_configs/qt5.yaml
Temporarily remove the webassembly build on windows.
coin/platform_configs/qtwebkit.yaml
Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt new file mode 100644 index 00000000..45447d86 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt @@ -0,0 +1,9 @@ +1563296480 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb +include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda +include/zlib.h: 0338828e9d00c94645648b1517108324 +lib/libzlib.a: 5dc51a25ecef8f9c97e6b67cec736634 +lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99 +licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e +zlib.pc: 29adeed07108745c3562dc19343f3d99 |