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/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/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/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/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/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt new file mode 100644 index 00000000..641788cf --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.2/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt @@ -0,0 +1,12 @@ +1563318176 +conaninfo.txt: 6ec16cc31fcf0bd158817c15ca8b5fab +include/jconfig.h: 4afbe7884ea1911cce5eb488828a2441 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 +lib/jpeg-static.lib: 5cd2ee8719b6d66010f5467e5b2df897 +lib/pkgconfig/libjpeg.pc: 8d5435c5c55ee8c6ac656a369397ab7e +lib/pkgconfig/libturbojpeg.pc: 16682a8d9851f1b61285ef3ba5cd999e +lib/turbojpeg-static.lib: 9f40b2cddb0673e15b28f5a345cd9d58 +licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 |