diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
| commit | bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0 (patch) | |
| tree | e3f0b23105b3ade96328314c6b59457068ebe8db /src/gui/text/qfontengine_p.h | |
| parent | a4d33d8c3cd206b982962014323abb673f5c64e3 (diff) | |
| parent | e004701bd7ba9e4a7cd5ac1bf784829feae16cae (diff) | |
| download | Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.zip Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.gz Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.bz2 | |
Merge remote branch 'fire/master'
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 7b29993..5b39fd3 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -185,9 +185,6 @@ public: virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, QPainterPath *path, QTextItem::RenderFlags flags); - /* Creates a QFont object to represent this particular QFontEngine */ - virtual QFont createExplicitFont() const; - void getGlyphPositions(const QGlyphLayout &glyphs, const QTransform &matrix, QTextItem::RenderFlags flags, QVarLengthArray<glyph_t> &glyphs_out, QVarLengthArray<QFixedPoint> &positions); @@ -276,7 +273,6 @@ public: int glyphFormat; protected: - QFont createExplicitFontWithName(const QString &familyName) const; static const QVector<QRgb> &grayPalette(); QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false); @@ -431,6 +427,7 @@ public: protected: friend class QPSPrintEnginePrivate; friend class QPSPrintEngineFontMulti; + friend class QRawFont; virtual void loadEngine(int at) = 0; QVector<QFontEngine *> engines; }; |