diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 12:55:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 12:55:00 (GMT) |
| commit | 9a5a12a5fe5bdf848756ddad20dabe288a6873de (patch) | |
| tree | 4116fe2b23d8689f7f10688d338c7fc8abe46b1e /src/gui/painting/qtextureglyphcache_p.h | |
| parent | 0d446ec758aacd131f2da0fa67a081fd93cff898 (diff) | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| download | Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.zip Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.tar.gz Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qtextureglyphcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
Diffstat (limited to 'src/gui/painting/qtextureglyphcache_p.h')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index 4131003..82aaf0d 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -64,6 +64,10 @@ # undef m_type #endif +#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH +#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256 +#endif + struct glyph_metrics_t; typedef unsigned int glyph_t; @@ -132,6 +136,8 @@ public: inline bool isNull() const { return m_h == 0; } QHash<GlyphAndSubPixelPosition, Coord> coords; + virtual int maxTextureWidth() const { return QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH; } + virtual int maxTextureHeight() const { return 32768; } QImage textureMapForGlyph(glyph_t g, QFixed subPixelPosition) const; |