diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-22 10:49:28 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:24 +0200 |
| commit | 6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch) | |
| tree | 1e3ad0e43cb775854835817cd04bdc8b5e047e15 /src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | |
| parent | aaa4a26f82f99fa8724841eba91bad029306e0ce (diff) | |
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 2fcc551667..7b7da9d8e8 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -63,10 +63,10 @@ QT_BEGIN_NAMESPACE class QGL2PaintEngineExPrivate; -struct QGLGlyphTexture : public QGLSharedResource +struct QGLGlyphTexture : public QOpenGLSharedResource { QGLGlyphTexture(const QGLContext *ctx) - : QGLSharedResource(ctx->contextHandle()->shareGroup()) + : QOpenGLSharedResource(ctx->contextHandle()->shareGroup()) , m_width(0) , m_height(0) { @@ -78,9 +78,9 @@ struct QGLGlyphTexture : public QGLSharedResource #endif } - void freeResource(QGuiGLContext *context) + void freeResource(QOpenGLContext *context) { - const QGLContext *ctx = QGLContext::fromGuiGLContext(context); + const QGLContext *ctx = QGLContext::fromOpenGLContext(context); #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG qDebug("~QGLGlyphTexture() %p for context %p.", this, ctx); #endif @@ -136,7 +136,7 @@ public: inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; } - inline const QGuiGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : 0; } + inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : 0; } inline int serialNumber() const { return m_serialNumber; } |