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-24 21:29:47 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-24 21:29:47 +0100
commit8a9f77ead179ce88df5113290fa0201872fcd74e (patch)
tree3abf6515ebba2412dc9a36a84d95a9870915e4b2 /src/gui/image/qimagereader.h
parentefb46ea7ccf6fe8f89a8228bb5afe34c51901824 (diff)
parent9df6f3367e971d4fad63e59bb42615e2b7a580ce (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