diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 21:21:45 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 21:21:45 +1000 |
| commit | 1edd1c95febc10b43e3a2cb94cecb25cdcc69146 (patch) | |
| tree | 432a7059de2fe20eba7dc1ee4fcb4add0085531a | |
| parent | 03fd149345da214271a65ea6b8b6548563c94d0b (diff) | |
| parent | f0857b766772b2dac0d7ced5cbc2edd66f2cdcca (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Compile on Mac
| -rw-r--r-- | src/gui/text/qrawfont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index 4f2a01e432..29394e9b7a 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -593,11 +593,11 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ // if none of them match, just pick the first one for (int i = 0; i < list.size(); i++) { QGlyphRun glyphs = list.at(i); - QRawFont rawfont = glyphs.font(); + QRawFont rawfont = glyphs.rawFont(); if (rawfont.familyName() == font.family()) return rawfont; } - return list.at(0).font(); + return list.at(0).rawFont(); } return QRawFont(); #else |