diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 10:10:31 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 10:10:31 +1000 |
| commit | 7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb (patch) | |
| tree | b4741e78769d8af5eb97e0ce7337bb89db9e0ef1 /src/gui/text/qfontengine_p.h | |
| parent | 68778d0d5c0eb9d85ac09e424bfabdd6ccce3b83 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
Merge remote branch 'origin/4.7' into master-from-4.7
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index b3a6c594f7..d07c8c9cba 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -232,6 +232,8 @@ public: static const uchar *getCMap(const uchar *table, uint tableSize, bool *isSymbolFont, int *cmapSize); static quint32 getTrueTypeGlyphIndex(const uchar *cmap, uint unicode); + static QByteArray convertToPostscriptFontFamilyName(const QByteArray &fontFamily); + QAtomicInt ref; QFontDef fontDef; uint cache_cost; // amount of mem used in kb by the font |