From 8afc0676471b4802884ca7ee78d0097f1e5b5646 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 20 Oct 2011 13:35:27 +0200
Subject: QtGui: Remove Q_WS and qpa.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable compilation without -qpa.
Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building.

Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/painting/qtextureglyphcache.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/gui/painting/qtextureglyphcache.cpp')

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index b56f6b42e4..5876f3bf93 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -42,10 +42,9 @@
 #include <qmath.h>
 
 #include "qtextureglyphcache_p.h"
-
+#include "private/qfontengine_p.h"
 #include "private/qnumeric_p.h"
 #include "private/qnativeimage_p.h"
-#include "private/qfontengine_ft_p.h"
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3