diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 10:53:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 10:53:28 (GMT) |
| commit | 2e62227f950aac8205f2b67e4d7d046836b2c799 (patch) | |
| tree | 87e91115d86896949f69e8c8d993ba795422ef3b /src/opengl/qgl.h | |
| parent | 9b0502aa6abf6bb9c07f205bccdf2d9c65027bde (diff) | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| download | Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.zip Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.gz Qt-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index d2fe5fb..c5ad945 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -410,11 +410,12 @@ private: friend class QOpenGLPaintEnginePrivate; friend class QGL2PaintEngineEx; friend class QGL2PaintEngineExPrivate; + friend class QGLEngineShaderManager; friend class QGLWindowSurface; friend class QGLPixmapData; friend class QGLPixmapFilterBase; friend class QGLTextureGlyphCache; - friend class QGLShareRegister; + friend class QGLContextGroup; friend class QGLSharedResourceGuard; friend class QGLPixmapBlurFilter; friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags(); |