summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglshadercache_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-18 01:00:07 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-18 01:00:20 +0100
commit858c5a73fc7d2bee1d116fb70f723c277bc0dc6d (patch)
treebb300759685fadd199b46dfb0cd98b4fe7968768 /src/gui/opengl/qopenglshadercache_p.h
parent4ec6748c6a30f74e6d8fbb90fc118b306d1fa690 (diff)
parent3e9f8b5249282324c615941af97f1ebf8a85991f (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/opengl/qopenglshadercache_p.h')
0 files changed, 0 insertions, 0 deletions