From 1582407fc782c0befd0760633324dd5c206524a1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 13 Oct 2011 14:25:18 +0200
Subject: Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/text/qfontengine_ft_p.h | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/gui/text/qfontengine_ft_p.h')

diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index f22a043548..bbef0bfcc7 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -58,9 +58,6 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#if defined(Q_WS_X11)
-#include <private/qt_x11_p.h>
-#endif
 
 #ifndef Q_OS_WIN
 #include <unistd.h>
@@ -165,9 +162,6 @@ public:
         Subpixel_VBGR
     };
 
-#if defined(Q_WS_X11) && !defined(QT_NO_XRENDER)
-    typedef XGlyphInfo GlyphInfo;
-#else
     struct GlyphInfo {
         unsigned short  width;
         unsigned short  height;
@@ -176,7 +170,6 @@ public:
         short           xOff;
         short           yOff;
     };
-#endif
 
     struct GlyphAndSubPixelPosition
     {
@@ -310,9 +303,6 @@ private:
                     const QFixedPoint *positions,
                     GlyphFormat format = Format_Render);
 
-#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
-    virtual void draw(QPaintEngine * /*p*/, qreal /*x*/, qreal /*y*/, const QTextItemInt & /*si*/) {}
-#endif
 
     QFontEngineFT(const QFontDef &fd);
     virtual ~QFontEngineFT();
-- 
cgit v1.2.3