summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_p.h
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-10-05 15:46:47 +0200
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-10-05 15:46:47 +0200
commitad04d96fdac0fea252096d5144abf684516cbb10 (patch)
tree50e9defb39955db39116677f2eef3d72e8053a26 /src/gui/text/qfontengine_p.h
parent1200bf9f82860d2f391a4b68ce25c606eb9a0831 (diff)
parentbbaf34b1f5ac4e6d425eab183112b504b9ed4e83 (diff)
Merge remote branch 'qt/master' into lighthouse-master
Conflicts: src/gui/painting/qpdf.cpp
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
-rw-r--r--src/gui/text/qfontengine_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index c1de906051..3a744a08e8 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