diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-04 22:00:19 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-04 22:00:19 (GMT) |
| commit | e3bcf44684aa30271c986911b328c9d9c372912a (patch) | |
| tree | de7f835e6fe69b610e64397a768f1630fb8b5c54 /src/gui/text/qfontengine_mac.mm | |
| parent | f3817bc1a7bc3df360af9116dfd96f3181816472 (diff) | |
| parent | a7bf1cfb1a75c35e837c01f4a5b0697fc8961148 (diff) | |
| download | Qt-e3bcf44684aa30271c986911b328c9d9c372912a.zip Qt-e3bcf44684aa30271c986911b328c9d9c372912a.tar.gz Qt-e3bcf44684aa30271c986911b328c9d9c372912a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
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 bdf3848..b3efe6c 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> @@ -1853,7 +1852,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; } |