summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/util/qtexturefilereader
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-12 08:37:40 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-09-12 08:48:05 +0000
commit307d0b32f08f159e7c3700d96d424d9725b5cc71 (patch)
treecd3df0204c4fb73ea2fa2f7a90da127d2df4e2b2 /tests/auto/gui/util/qtexturefilereader
parent2d82cb7d779c2fa1fc54ecc7c98f66b125856dff (diff)
parent8e3dcd686b4637d6bfe95b0ca2c722bb1271c8c8 (diff)
Merge "Merge remote-tracking branch 'origin/5.11.2' into 5.12" into refs/staging/5.12
Diffstat (limited to 'tests/auto/gui/util/qtexturefilereader')
0 files changed, 0 insertions, 0 deletions