diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:56:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:56:03 (GMT) |
| commit | 8485052e3991aebf7c823b3e80fc06ccf9f08991 (patch) | |
| tree | dcb2db231d640bc9327fe625353fa1e43fcb572d /src/gui/text/qfontdatabase_mac.cpp | |
| parent | 685df07ff7e357f6848c50cffa311641afdca307 (diff) | |
| parent | 6c121991f85164d257208b14845c7ff913a687f4 (diff) | |
| download | Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.zip Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.gz Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Make sure #ifdef'd tests still have main() function
Long live QRawFont!
Diffstat (limited to 'src/gui/text/qfontdatabase_mac.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_mac.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp index ad2c1b2..5ba236b 100644 --- a/src/gui/text/qfontdatabase_mac.cpp +++ b/src/gui/text/qfontdatabase_mac.cpp @@ -72,7 +72,7 @@ static void initWritingSystems(QtFontFamily *family, ATSFontRef atsFont) qFromBigEndian<quint32>(os2Table.data() + 54) }; quint32 codePageRange[2] = { qFromBigEndian<quint32>(os2Table.data() + 78), qFromBigEndian<quint32>(os2Table.data() + 82) }; - QList<QFontDatabase::WritingSystem> systems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange); + QList<QFontDatabase::WritingSystem> systems = qt_determine_writing_systems_from_truetype_bits(unicodeRange, codePageRange); #if 0 QCFString name; ATSFontGetName(atsFont, kATSOptionFlagsDefault, &name); @@ -244,6 +244,11 @@ static const char *styleHint(const QFontDef &request) return stylehint; } +static inline float weightToFloat(unsigned int weight) +{ + return (weight - 50) / 100.0; +} + void QFontDatabase::load(const QFontPrivate *d, int script) { // sanity checks |