diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 13:15:10 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 13:15:10 +0200 |
| commit | 48b7c870ec5840a5367700ebf40005bfb69b47c9 (patch) | |
| tree | 304cd03c3d82e4187a2ce63f1842e4e320a7d165 /src/gui/text | |
| parent | 1e331968e1497cf45722d125065096670665cda7 (diff) | |
| parent | f0857b766772b2dac0d7ced5cbc2edd66f2cdcca (diff) | |
Merge remote-tracking branch 'staging/master'
Diffstat (limited to 'src/gui/text')
| -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 |