diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 02:34:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 02:34:04 (GMT) |
| commit | 8cbc34de67d52d5923b3a70bf84aadfe3aa94f24 (patch) | |
| tree | f109ef895f52d1d7b678c61a3fd51dad7debd122 /src/gui/text/qfontengine_p.h | |
| parent | 33b76a659b2f44fa7038e375bbfb4cfd449ae617 (diff) | |
| parent | ea8dd9d2dbd3345fbf76625c441d9832f758bf70 (diff) | |
| download | Qt-8cbc34de67d52d5923b3a70bf84aadfe3aa94f24.zip Qt-8cbc34de67d52d5923b3a70bf84aadfe3aa94f24.tar.gz Qt-8cbc34de67d52d5923b3a70bf84aadfe3aa94f24.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
Fixed antialiased rendering error in raster engine due to wrong merge.
FocusOut even when QGraphicsItem gets hidden.
Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem
Fixed accessing freed memory in raster engine.
Build fix for -qtnamespace.
Fixed parsing of SVGs with absolute font sizes.
Moving QPdf::stripSpecialCharacter to fontengine
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Fixed a layout issue where you could get NaN as dimensions
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
...
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 3b91cd8..571cf98 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -227,6 +227,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 |