diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:37 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:37 +0100 |
commit | f422f52fcd7d0d5418d91b24508c3d5338cfd61a (patch) | |
tree | 39f5d046ddbf3ec50e56ab2709eec7fe9b2a5f77 /src/plugins/imageformats/tiff/qtiffhandler.cpp | |
parent | e2a8369ea2786abe79e45bf600eda14bef8c4012 (diff) | |
parent | 4defbd4c1b8a6450d690b11e98ae3e1f93cc96d6 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I25aab73ceef95d11a23e4fb2ac1c6c4c84f7e134
Diffstat (limited to 'src/plugins/imageformats/tiff/qtiffhandler.cpp')
0 files changed, 0 insertions, 0 deletions