diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/gui/opengl/qopenglpaintdevice.cpp | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/gui/opengl/qopenglpaintdevice.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglpaintdevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp index 118fe63122..32da27a078 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -63,10 +63,10 @@ QT_BEGIN_NAMESPACE \ingroup painting-3D When painting to a QOpenGLPaintDevice using QPainter, the state of - the current GL context will be altered by the paint engine to reflect - its needs. Applications should not rely upon the GL state being reset + the current OpenGL context will be altered by the paint engine to reflect + its needs. Applications should not rely upon the OpenGL state being reset to its original conditions, particularly the current shader program, - GL viewport, texture units, and drawing modes. + OpenGL viewport, texture units, and drawing modes. */ class QOpenGLPaintDevicePrivate |