diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:02:43 +0200 |
| commit | a94696ccd5be936099809eda58db02999cb7c77a (patch) | |
| tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt | |
| parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
| parent | 125c5e6528abee7796f6e5b68526bc050bd9250e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.gitmodules
ignore QtWebEngine on QEMU temporarily.
coin/platform_configs/default.yaml
no-gui build was removed temporarily.
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/qtsaferenderer.yaml
Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
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 |