diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-04 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-04 01:00:07 +0100 |
| commit | d025c1a75f722f3adfd77f8d7f887e754c925d17 (patch) | |
| tree | 22efcb332a975652cbde1db81e15b844c4007137 /src/opengl/qgraphicsshadereffect_p.h | |
| parent | 2ed59f0d42d2817a5855be167f5e3ccf23563e39 (diff) | |
| parent | dc7fa56948a2a7953f645c7f9d7237925b3f9abe (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ia70e81943ef097941339f9ef9ace28592a2eb740
Diffstat (limited to 'src/opengl/qgraphicsshadereffect_p.h')
0 files changed, 0 insertions, 0 deletions