From 74868367dce9038dfbac574196e6b2d75ab977e7 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 15 Jul 2010 11:05:37 +0200
Subject: Fixed QT_NO_FREETYPE define.

This define is also used by the OpenVG module, and therefore needs
to be defined everywhere.

RevBy:    Jason Barron
---
 configure             | 1 +
 src/gui/text/text.pri | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure b/configure
index 51628d7..a97c5d1 100755
--- a/configure
+++ b/configure
@@ -6687,6 +6687,7 @@ elif [ "$CFG_TIFF" = "yes" ]; then
 fi
 if [ "$CFG_LIBFREETYPE" = "no" ]; then
     QT_CONFIG="$QT_CONFIG no-freetype"
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE"
 elif [ "$CFG_LIBFREETYPE" = "system" ]; then
     QT_CONFIG="$QT_CONFIG system-freetype"
 else
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 34311a9..af8daa5 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -197,8 +197,6 @@ contains(QT_CONFIG, freetype) {
     # pull in the proper freetype2 include directory
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
     LIBS_PRIVATE += -lfreetype
-} else {
-    DEFINES *= QT_NO_FREETYPE
 }
 
 contains(QT_CONFIG, fontconfig) {
-- 
cgit v0.12