diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-08 07:01:15 (GMT) |
| commit | 23ae8b6badfd688f962590268a6147771d27266c (patch) | |
| tree | fc27f20c32e6dccbe39267214e65528b238ced70 /src/gui/text/qfontdatabase_mac.cpp | |
| parent | 768cab51239a45f00d5ee3857efecd3d2cdcb99b (diff) | |
| parent | d4257360234a967bfbacde92ec2bb1ac8979b793 (diff) | |
| download | Qt-23ae8b6badfd688f962590268a6147771d27266c.zip Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.gz Qt-23ae8b6badfd688f962590268a6147771d27266c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/text/qfontdatabase_mac.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_mac.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp index 80ddbd5..26d8687 100644 --- a/src/gui/text/qfontdatabase_mac.cpp +++ b/src/gui/text/qfontdatabase_mac.cpp @@ -281,14 +281,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script) } //find the font - QStringList family_list = req.family.split(QLatin1Char(',')); - // append the substitute list for each family in family_list - { - QStringList subs_list; - for(QStringList::ConstIterator it = family_list.constBegin(); it != family_list.constEnd(); ++it) - subs_list += QFont::substitutes(*it); - family_list += subs_list; - } + QStringList family_list = familyList(req); const char *stylehint = styleHint(req); if (stylehint) |