From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Sep 2012 13:12:32 +0000 (+0200)
Subject: fix build failure for MinGW using "system" freetype
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb42be700a3ef5161a81a7fc77814792eb0e08e8;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index 4537948..1527f0e 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