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

Do not add QPF fonts to basic font db

Browse Source 
QPlatformFontDatabase::populateFontDatabase() routine uses a different
usrPtr format which is not compatible with the one basic font db uses
(FontFile *). We shouldn't mix them together.

Task-number: QTBUG-22713
Change-Id: I239ea085e14261f6b9ba66b03710a590a44378f9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
This commit is contained in:
Jiang Jiang 2011-11-14 11:47:03 +01:00 committed by Qt by Nokia
parent fc659979e6
commit 1916460015
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
View File

@ -188,7 +188,6 @@ static inline bool scriptRequiresOpenType(int script)
void QBasicFontDatabase::populateFontDatabase() void QBasicFontDatabase::populateFontDatabase()
{ {
QPlatformFontDatabase::populateFontDatabase();
QString fontpath = fontDir(); QString fontpath = fontDir();
if(!QFile::exists(fontpath)) { if(!QFile::exists(fontpath)) {