diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:25:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:25:20 +0100 |
| commit | 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 (patch) | |
| tree | d27d03bf55f92c7a362e5bed53c578fcb1b5cf03 /src/plugins/imageformats/tiff/qtiffhandler.cpp | |
| parent | ff6cf6764ded8c028f693da70b876a00fbff2a5f (diff) | |
| parent | 9fe1f2e918d39031852805f1add23125c061d3c3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Ib4b1a3a3604fdce35f61dadc26770ca9b749e008
Diffstat (limited to 'src/plugins/imageformats/tiff/qtiffhandler.cpp')
0 files changed, 0 insertions, 0 deletions