diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 10:35:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 10:35:02 (GMT) |
commit | ebb539d3852658a104e6d59804ea9ad813f9e82d (patch) | |
tree | 463880587981051da456cc7cf8ca3e1bcbc0634c /src/opengl/qgl.h | |
parent | 32d6c5adb9d75ad7e3b2cef818f6b17d77d0f929 (diff) | |
parent | 40c8aba524831dd0d2f8dfcdf07797f5c2c47f5b (diff) | |
download | Qt-ebb539d3852658a104e6d59804ea9ad813f9e82d.zip Qt-ebb539d3852658a104e6d59804ea9ad813f9e82d.tar.gz Qt-ebb539d3852658a104e6d59804ea9ad813f9e82d.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
QGLPixelBuffer should not rely on temporary QGLWidgets.
Initialize pex.
Remove warning.
Fix the tests for the internal GL resource system.
Rework how QGLTextureGlyphCache makes use of the resource system.
The group pointer should no longer be a part of the 64 bit int.
Enable glyph uploads from a thread in the X11 font engine.
Make qt_pixmap_serial thread-safe.
Clean up debug output.
Clarification regarding the WA_X11InitThreads flag.
Rework the internal GL resource system yet again.
Check Qt::AA_X11InitThreads to determine pixmap usage in threads.
Add an application attribute to control XInitThreads().
Unnecessary alloc + remove unused headers.
QGLPixelBuffer should manage its own paint engines.
Remove the DDS texture cache.
Make the GL texture cache share textures between shared contexts.
Redesigned how GL resource management works.
Don't use the QGLSignalProxy to clean up the thread-local shaders.
Simplify how the QGLEngineSharedShaders object is cleaned up.
...
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r-- | src/opengl/qgl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index f85cad5..9315ac4 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -424,6 +424,7 @@ private: friend class QGLPixmapData; friend class QGLPixmapFilterBase; friend class QGLTextureGlyphCache; + friend struct QGLGlyphTexture; friend class QGLContextGroup; friend class QGLSharedResourceGuard; friend class QGLPixmapBlurFilter; @@ -443,6 +444,7 @@ private: friend class QGLWidgetGLPaintDevice; friend class QX11GLPixmapData; friend class QX11GLSharedContexts; + friend class QGLContextResourceBase; private: Q_DISABLE_COPY(QGLContext) }; |