diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-23 14:49:41 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-23 14:49:41 (GMT) |
| commit | d0694162b872befc8c57dbf900bbd502ce25b80d (patch) | |
| tree | cb078d538f9df9ae5dbcbd647b6010604a744fac /src/gui/painting/qtextureglyphcache_p.h | |
| parent | 3dc88a6229afc72125fa5565eb565a6fbc92620f (diff) | |
| parent | cfc1e1c3687d7ad1ddf4b5650d06bf52de4e3576 (diff) | |
| download | Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.zip Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.gz Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/painting/qtextureglyphcache_p.h')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index e6d2b22..94cb555 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -96,7 +96,7 @@ public: int baseLineY; }; - void populate(QFontEngine *fontEngine, int numGlyphs, const glyph_t *glyphs, + bool populate(QFontEngine *fontEngine, int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions); virtual void createTextureData(int width, int height) = 0; @@ -118,7 +118,7 @@ public: QImage textureMapForGlyph(glyph_t g) const; virtual int maxTextureWidth() const { return QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH; } - virtual int maxTextureHeight() const { return 32768; } + virtual int maxTextureHeight() const { return -1; } protected: QFontEngine *m_current_fontengine; |