diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-10-22 06:45:24 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-10-22 06:45:24 (GMT) |
| commit | 822e8a6d59847035fe91970487dbb2a765042553 (patch) | |
| tree | 4266f47c70353e724201d2c61b1f988dea62707d /src/opengl/qgl.h | |
| parent | f07a027b342e09fbb9d1678d3855cddfc27d3925 (diff) | |
| parent | 100afe8da00fdb1661b22e049960ed00a1d3c765 (diff) | |
| download | Qt-822e8a6d59847035fe91970487dbb2a765042553.zip Qt-822e8a6d59847035fe91970487dbb2a765042553.tar.gz Qt-822e8a6d59847035fe91970487dbb2a765042553.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index b1c1317..e14e7fb 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -411,6 +411,7 @@ private: friend class QGLFramebufferObjectPrivate; friend class QGLFBOGLPaintDevice; friend class QGLPaintDevice; + friend class QX11GLPixmapData; private: Q_DISABLE_COPY(QGLContext) }; |