diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-10 15:48:36 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-10 15:48:36 (GMT) |
| commit | 700a4826cf6bd755df000cb16c259343efb695cd (patch) | |
| tree | 69b19857c352891dd05b35ddf54b997634442379 /src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | |
| parent | 3aee7b78ba1f6c1e4eab9202ddac58e01b3258e7 (diff) | |
| parent | 9385f050620f14e3c3e4616906cf1999bf166041 (diff) | |
| download | Qt-700a4826cf6bd755df000cb16c259343efb695cd.zip Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.gz Qt-700a4826cf6bd755df000cb16c259343efb695cd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 6bcd655..84e9021 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -72,6 +72,7 @@ public: virtual void createTextureData(int width, int height); virtual void resizeTextureData(int width, int height); virtual void fillTexture(const Coord &c, glyph_t glyph); + virtual int glyphMargin() const; virtual int glyphPadding() const; inline GLuint texture() const { return m_texture; } |