diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-05 00:10:31 (GMT) |
| commit | 7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb (patch) | |
| tree | b4741e78769d8af5eb97e0ce7337bb89db9e0ef1 /src/gui/text/qfontengine_mac.mm | |
| parent | 68778d0d5c0eb9d85ac09e424bfabdd6ccce3b83 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.zip Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.gz Qt-7f94e6a6f48176a5b5cfd61c796a4fa2bcc63afb.tar.bz2 | |
Merge remote branch 'origin/4.7' into master-from-4.7
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 6e524f6..ebc1f6d 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -46,7 +46,6 @@ #include <qbitmap.h> #include <private/qpaintengine_mac_p.h> #include <private/qprintengine_mac_p.h> -#include <private/qpdf_p.h> #include <qglobal.h> #include <qpixmap.h> #include <qpixmapcache.h> @@ -1876,7 +1875,7 @@ QFontEngine::Properties QFontEngineMac::properties() const QCFString psName; if (ATSFontGetPostScriptName(FMGetATSFontRefFromFont(fontID), kATSOptionFlagsDefault, &psName) == noErr) props.postscriptName = QString(psName).toUtf8(); - props.postscriptName = QPdf::stripSpecialCharacters(props.postscriptName); + props.postscriptName = QFontEngine::convertToPostscriptFontFamilyName(props.postscriptName); return props; } |