diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-11-14 11:47:03 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-15 01:05:49 +0100 |
| commit | 191646001524c82f8a5216b033eb45fff46f580f (patch) | |
| tree | 65b5d72d59df4e7fce73643feec3597f6b747a54 /src | |
| parent | fc659979e6552efc1360e17e193b44ec2e2df529 (diff) | |
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 <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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)) { |