diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-02 13:44:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-02 13:44:48 (GMT) |
| commit | c9d4611092e780c0cf386bd119d548398798b50a (patch) | |
| tree | 5339441d9eee460e8e62680d2539584fca4e781e /src | |
| parent | 58f92a562d7b056bc69e7b0d43670c42d8d8577d (diff) | |
| parent | 024ecc0c84f7bb832f6816790d02542d4ed2683d (diff) | |
| download | Qt-c9d4611092e780c0cf386bd119d548398798b50a.zip Qt-c9d4611092e780c0cf386bd119d548398798b50a.tar.gz Qt-c9d4611092e780c0cf386bd119d548398798b50a.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:
Fix QFont related compilation errors on Mac OSX Carbon
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontdatabase_mac.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp index fc8247d..9a8e8af 100644 --- a/src/gui/text/qfontdatabase_mac.cpp +++ b/src/gui/text/qfontdatabase_mac.cpp @@ -251,7 +251,7 @@ static inline float weightToFloat(unsigned int weight) return (weight - 50) / 100.0; } -static QFontEngine *loadFromDatabase(const QFontDef &req, const QFontPrivate *d) +static QFontEngine *loadFromDatabase(QFontDef &req, const QFontPrivate *d) { #if defined(QT_MAC_USE_COCOA) QCFString fontName = NULL; @@ -302,7 +302,7 @@ found: QCFString actualName; if (ATSFontFamilyGetName(familyRef, kATSOptionFlagsDefault, &actualName) == noErr) req.family = actualName; - return new QFontEngineMacMulti(familyRef, req, fontDef, d->kerning); + return new QFontEngineMacMulti(familyRef, fontRef, req, d->kerning); } #endif return NULL; diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 6186b2f..14ded69 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -369,7 +369,7 @@ int QFontEngineMacMulti::fontIndexForFontID(ATSUFontID id) const bool QFontEngineMacMulti::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const { - return stringToCMap(str, len, glyphs, nglyphs, flags, /*logClusters=*/0, /*charAttributes=*/0); + return stringToCMap(str, len, glyphs, nglyphs, flags, /*logClusters=*/0, /*charAttributes=*/0, /*si=*/0); } bool QFontEngineMacMulti::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags, |