From de6445272d4795c775cafa76c041b08e3d27c01d Mon Sep 17 00:00:00 2001 From: Olli Werwolff Date: Fri, 7 Oct 2011 10:00:04 +0200 Subject: Use freetype font engine on Windows As windows' fontdatabases also uses functionalities from qbasicunixfontdatabase it was renamed to qbasicfontdatabase. But instead of iterating over the font directories' files it uses system calls to obtain the list of fonts and uses registry values to find the according filenames to add. The native font engine was still kept. It can be activated by adding fontengine=native as platformargument. Change-Id: I7197bed5d18b8a33d4aa97ce91bfa1cd281b80ea Reviewed-on: http://codereview.qt-project.org/5839 Reviewed-by: Eskil Abrahamsen Blomfeldt Sanity-Review: Eskil Abrahamsen Blomfeldt --- src/platformsupport/fontdatabases/fontdatabases.pri | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/platformsupport/fontdatabases/fontdatabases.pri') diff --git a/src/platformsupport/fontdatabases/fontdatabases.pri b/src/platformsupport/fontdatabases/fontdatabases.pri index a31f050158..3e4b0e9970 100644 --- a/src/platformsupport/fontdatabases/fontdatabases.pri +++ b/src/platformsupport/fontdatabases/fontdatabases.pri @@ -2,10 +2,14 @@ DEFINES += QT_COMPILES_IN_HARFBUZZ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src CONFIG += qpa/genericunixfontdatabase +!win32|contains(QT_CONFIG, freetype) { + include($$PWD/basic/basic.pri) +} + unix { - include($$PWD/basicunix/basicunix.pri) include($$PWD/genericunix/genericunix.pri) contains(QT_CONFIG,fontconfig) { include($$PWD/fontconfig/fontconfig.pri) } } + -- cgit v1.2.3