diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
| commit | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (patch) | |
| tree | c0deb1de9b52f466a1d4128094652d8b5e983038 /src/gui/text/qfontengine_ft.cpp | |
| parent | 94cae67da50d68f70d728a7fb231de89d47263db (diff) | |
| parent | f6d9c3f0dd014c409c43150b3a10866f47ea54a6 (diff) | |
| download | Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.zip Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.gz Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.bz2 | |
Merge commit 'origin/4.7' into mimir
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index a9b25f5..cc6af7f 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -51,7 +51,6 @@ #include "qabstractfileengine.h" #include "qthreadstorage.h" #include <qmath.h> -#include <private/qpdf_p.h> #include <private/qharfbuzz_p.h> #include "qfontengine_ft_p.h" @@ -1196,10 +1195,7 @@ QFontEngine::Properties QFontEngineFT::properties() const { Properties p = freetype->properties(); if (p.postscriptName.isEmpty()) { - p.postscriptName = fontDef.family.toUtf8(); -#ifndef QT_NO_PRINTER - p.postscriptName = QPdf::stripSpecialCharacters(p.postscriptName); -#endif + p.postscriptName = QFontEngine::convertToPostscriptFontFamilyName(fontDef.family.toUtf8()); } return freetype->properties(); |