AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile on Mac
This commit is contained in:
Qt Continuous Integration System 2011-05-10 21:21:45 +10:00
commit 1edd1c95fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/text/qrawfont.cpp
View File

@ -593,11 +593,11 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ
// if none of them match, just pick the first one // if none of them match, just pick the first one
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
QGlyphRun glyphs = list.at(i); QGlyphRun glyphs = list.at(i);
QRawFont rawfont = glyphs.font(); QRawFont rawfont = glyphs.rawFont();
if (rawfont.familyName() == font.family()) if (rawfont.familyName() == font.family())
return rawfont; return rawfont;
} }
return list.at(0).font(); return list.at(0).rawFont();
} }
return QRawFont(); return QRawFont();
#else #else