diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-01-23 15:23:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-23 15:24:14 +0100 |
| commit | d51c6983baedc283020b39062714962b6b7d0c5e (patch) | |
| tree | dbf93254ef97b0f01b043d3bd94fb840c7bec013 /src/render/materialsystem/qshaderdata.cpp | |
| parent | b0e11393968ceaad8c35e7df528c73a5e6111f32 (diff) | |
| parent | 77aa17d543f09802f1d9eade8ab1278b0fba203f (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/render/renderers/opengl/textures/gltexture.cpp
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I2b419458913a2e3cb2064b934b07b1f6ff05e3cd
Diffstat (limited to 'src/render/materialsystem/qshaderdata.cpp')
0 files changed, 0 insertions, 0 deletions