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/export | |
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/export')
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..6b51b7b6 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,7 @@ +1563296424 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +LICENSE: 1ac8330e79e050867144e174d80880f7 +conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d +export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7 +export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7 +export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a |