summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimagereader.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-26 20:55:01 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-26 20:55:01 +0100
commit32da9ae38969c2e4f01968401339433e7909eed8 (patch)
treeafe1b708d2dd22fcda239d8a9808468e3d84d931 /src/gui/image/qimagereader.h
parent8a9f77ead179ce88df5113290fa0201872fcd74e (diff)
parentb2d2b655e58d5337765c26dafa836b12e019c6a4 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/gui/image/qimagereader.h')
0 files changed, 0 insertions, 0 deletions