From 5a598afa3f1928e9ad18257e2fa48fe3d5739917 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Sat, 4 Jun 2011 17:47:13 +0200
Subject: Fix compile when configure with no fontconfig support

Task-number: QTBUG-19716
Reviewed-by: Eskil
---
 src/gui/text/qrawfont_ft.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/text/qrawfont_ft.cpp b/src/gui/text/qrawfont_ft.cpp
index e8c10a5..db60459 100644
--- a/src/gui/text/qrawfont_ft.cpp
+++ b/src/gui/text/qrawfont_ft.cpp
@@ -46,7 +46,7 @@
 #include "qrawfont_p.h"
 #include "qfontengine_ft_p.h"
 
-#if defined(Q_WS_X11)
+#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
 #  include "qfontengine_x11_p.h"
 #endif
 
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QFontEngineFTRawFont
 
-#if defined(Q_WS_X11)
+#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
         : public QFontEngineX11FT
 #else
         : public QFontEngineFT
@@ -63,7 +63,7 @@ class QFontEngineFTRawFont
 {
 public:
     QFontEngineFTRawFont(const QFontDef &fontDef)
-#if defined(Q_WS_X11)
+#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
         : QFontEngineX11FT(fontDef)
 #else
         : QFontEngineFT(fontDef)
-- 
cgit v0.12