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/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/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/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt new file mode 100644 index 00000000..bf462a03 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt @@ -0,0 +1,12 @@ +1563317951 +conaninfo.txt: 30e51ce35bad9c012af4f30e6e7892ed +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: 9bc7573efc66b8352d20c75ccc749f02 +lib/pkgconfig/libjpeg.pc: 8262515528659421186ba8c1ec623689 +lib/pkgconfig/libturbojpeg.pc: 837f896e637fff65f9d69c867fafdfec +lib/turbojpeg-static.lib: c018bdcd94775b2a7b25c1a69742cf28 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 |