diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-09-24 15:12:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 21:27:51 +0200 |
| commit | eb42be700a3ef5161a81a7fc77814792eb0e08e8 (patch) | |
| tree | 323032702b31e8b3e41d9b63cd7e105d07fa6878 | |
| parent | 03f4930ecab95a793601666c1f4a73c207fa1f4d (diff) | |
fix build failure for MinGW using "system" freetype
The configure script correctly detects freetype and sets
"system-freetype" in QT_CONFIG. However, the project file did not
consider this possibility.
Change-Id: I9ce90e7cd032a12ed7d06d3858b16c5a8d90c073
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 45379488f7..1527f0e496 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -161,6 +161,12 @@ contains(QT_CONFIG, freetype) { contains(QT_CONFIG, system-zlib) { DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB } +} else:contains(QT_CONFIG, system-freetype) { + include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri) + HEADERS += \ + qwindowsfontdatabase_ft.h + SOURCES += \ + qwindowsfontdatabase_ft.cpp } OTHER_FILES += windows.json |