summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-03-12 13:38:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-15 10:45:10 +0100
commit3d2160056e409ad2508a8bff4288944d37e32f85 (patch)
tree03e4cc4ccc354066796b2536acb2a5e74e142d56 /src/opengl/gl2paintengineex/qglengineshadermanager_p.h
parent77bf302ce2d69fb01e41b02329fdb8419b6e9e52 (diff)
Resurrect QGLWidget::renderText()
The variant taking x, y, z has been broken in all Qt 5.x releases. This is now corrected by making the GL2 paint engine capable of applying a Z translation. Task-number: QTBUG-31156 Change-Id: I119566e9e9577f6cdf7e8bae56cac1e34995e622 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index bbd9d86773..166d9a0593 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -444,6 +444,7 @@ public:
BrushTransform,
BrushTexture,
Matrix,
+ TranslateZ,
NumUniforms
};