diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:32 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:33 +0100 |
commit | cd04181b2ba20e98a29a1782b3736539f70f6607 (patch) | |
tree | a5c82740a2145599d3d9a70598180f0cbe046ad9 /tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb | |
parent | 3ea6a13a01f513ab491f698109fdf189e6264203 (diff) | |
parent | b56e856d218976bf39d981468267337d8d6223f5 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7f11733bda960196a96c6452bdabeb7072a8430d
Diffstat (limited to 'tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb')
-rw-r--r-- | tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb | bin | 0 -> 1691 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb b/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb Binary files differnew file mode 100644 index 0000000000..79f5486945 --- /dev/null +++ b/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb |