From: Jiang Jiang Date: Tue, 20 Mar 2012 08:56:00 +0000 (+0100) Subject: Fix a typo in QFontconfigDatabase X-Git-Tag: qt-v5.0.0-alpha1~180 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d6e16a6ac5fd23453063912206d1c6dcc59e62d;p=profile%2Fivi%2Fqtbase.git Fix a typo in QFontconfigDatabase Font family names for default families (Serif, Sans serif, Monospace) was only taken from the first family in the array (aka. always Serif). Change-Id: Ia326dc85e03819f1a72deda66aade348809d94da Reviewed-by: Eskil Abrahamsen Blomfeldt --- diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index a4d2778..7650d77 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -453,9 +453,8 @@ void QFontconfigDatabase::populateFontDatabase() QSupportedWritingSystems ws; ws.setSupported(QFontDatabase::Latin); - - QString familyQtName = QString::fromLatin1(f->qtname); while (f->qtname) { + QString familyQtName = QString::fromLatin1(f->qtname); registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleNormal,QFont::Unstretched,true,true,0,f->fixed,ws,0); registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleItalic,QFont::Unstretched,true,true,0,f->fixed,ws,0); registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleOblique,QFont::Unstretched,true,true,0,f->fixed,ws,0);