fix build failure for MinGW using "system" freetype
authorMark Brand <mabrand@mabrand.nl>
Mon, 24 Sep 2012 13:12:32 +0000 (15:12 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 24 Sep 2012 19:27:51 +0000 (21:27 +0200)
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>
src/plugins/platforms/windows/windows.pro

index 4537948..1527f0e 100644 (file)
@@ -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