From 191646001524c82f8a5216b033eb45fff46f580f Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Mon, 14 Nov 2011 11:47:03 +0100 Subject: Do not add QPF fonts to basic font db 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 --- src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index 329a1176c6..9c5d3be637 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -188,7 +188,6 @@ static inline bool scriptRequiresOpenType(int script) void QBasicFontDatabase::populateFontDatabase() { - QPlatformFontDatabase::populateFontDatabase(); QString fontpath = fontDir(); if(!QFile::exists(fontpath)) { -- cgit v1.2.3